Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10abc13

Browse files
committed
move compiler out of MSI and into a VSIX
1 parent061c0e5 commit10abc13

File tree

25 files changed

+212
-303
lines changed

25 files changed

+212
-303
lines changed

‎build.cmd‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ if "%BUILD_NET40%" == "1" (
771771
echo ---------------- Done with assembly version checks, starting assembly signing ---------------
772772

773773
ifnot"%SIGN_TYPE%"=="" (
774-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
775-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
774+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
775+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
776776
ifERRORLEVEL1echo Error running sign tool&&goto :failure
777777
)
778778

@@ -783,8 +783,8 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU
783783
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
784784

785785
ifnot"%SIGN_TYPE%"=="" (
786-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
787-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
786+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
787+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
788788
ifERRORLEVEL1echo Error running sign tool&&goto :failure
789789
)
790790

@@ -795,8 +795,8 @@ if "%BUILD_SETUP%" == "1" (
795795
)
796796

797797
ifnot"%SIGN_TYPE%"=="" (
798-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
799-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
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
800800
ifERRORLEVEL1echo Error running sign tool&&goto :failure
801801
)
802802

@@ -807,8 +807,8 @@ if "%BUILD_SETUP%" == "1" (
807807
)
808808

809809
ifnot"%SIGN_TYPE%"=="" (
810-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
811-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
810+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
811+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
812812
ifERRORLEVEL1echo Error running sign tool&&goto :failure
813813
)
814814

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
{
2-
"sign": [
3-
{
4-
"certificate":"VsixSHA2",
5-
"strongName":null,
6-
"values": [
7-
"insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
8-
]
9-
}
10-
],
11-
"exclude": [
12-
]
13-
}
14-
2+
"sign": [
3+
{
4+
"certificate":"VsixSHA2",
5+
"strongName":null,
6+
"values": [
7+
"insertion\\Microsoft.FSharp.Compiler.vsix",
8+
"insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
9+
"insertion\\Microsoft.FSharp.SDK.Resources.*.vsix"
10+
]
11+
}
12+
],
13+
"exclude": [
14+
"fsc.exe",
15+
"FSharp.Build.dll",
16+
"FSharp.Build.resources.dll",
17+
"FSharp.Core.dll",
18+
"FSharp.Core.resources.dll",
19+
"FSharp.Compiler.Private.dll",
20+
"FSharp.Compiler.Private.resources.dll",
21+
"FSharp.Compiler.Server.Shared.dll",
22+
"FSharp.Compiler.Interactive.Settings.dll",
23+
"FSharp.Compiler.Interactive.Settings.resources.dll",
24+
"fsi.exe",
25+
"fsiAnyCpu.exe",
26+
"FSharp.Data.TypeProviders.dll",
27+
"Microsoft.Build.dll",
28+
"Microsoft.Build.Conversion.Core.dll",
29+
"Microsoft.Build.Engine.dll",
30+
"Microsoft.Build.Framework.dll",
31+
"Microsoft.Build.Tasks.Core.dll",
32+
"Microsoft.Build.Utilities.Core.dll",
33+
"System.Collections.Immutable.dll",
34+
"System.Reflection.Metadata.dll",
35+
"System.ValueTuple.dll"
36+
]
37+
}

‎build/scripts/run-signtool.cmd‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ if /i "%arg%" == "-SignType" (
2626
setSignType=%argv%
2727
shift
2828
)
29+
if /i"%arg%"=="-Configuration" (
30+
setConfiguration=%argv%
31+
shift
32+
)
2933
if /i"%arg%"=="-ConfigFile" (
3034
setConfigFile=%argv%
3135
shift
@@ -50,7 +54,7 @@ set SignToolArgs=%SignToolArgs% -test
5054
:runsigntool
5155

5256
ifnotexist"%_signtoolexe%"echo The signing tool could not be found at location '%_signtoolexe%'&&goto error
53-
setSignToolArgs=%SignToolArgs%"%scriptdir%..\..\release"
57+
setSignToolArgs=%SignToolArgs%"%scriptdir%..\..\%Configuration%"
5458
echo"%_signtoolexe%"%SignToolArgs%
5559
"%_signtoolexe%"%SignToolArgs%
5660
iferrorlevel1goto error
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
net4*/
2+
netstandard*/

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,6 @@
7878
</Directory>
7979
</Directory>
8080
</Directory>
81-
82-
<DirectoryId="MicrosoftSDKs"Name="Microsoft SDKs">
83-
<DirectoryId="MicrosoftSDKs_FS"Name="F#">
84-
<DirectoryId="MicrosoftSDKs_FS_10.1"Name="10.1">
85-
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework"Name="Framework">
86-
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework_v4.0"Name="v4.0">
87-
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework_v4.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
88-
</Directory>
89-
</Directory>
90-
</Directory>
91-
92-
<DirectoryId="MicrosoftSDKs_FS_Licenses"Name="Licenses">
93-
<DirectoryId="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)"Name="$(var.LocaleId)" />
94-
</Directory>
95-
</Directory>
96-
</Directory>
9781
</Directory>
9882
</Directory>
9983
</Fragment>

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
<CompileInclude="Common.Wix.Properties.wxs" />
4949

5050
<CompileInclude="FSharp.SDK.wxs" />
51-
52-
<CompileCondition="'$(IsLangPack)' != 'true'"Include="component-groups\Compiler_Redist.wxs" />
53-
<CompileCondition="'$(IsLangPack)' == 'true'"Include="component-groups\Compiler_LangPack.wxs" />
5451

5552
<CompileCondition="'$(IsLangPack)' != 'true'"Include="component-groups\Runtime_Redist.wxs" />
5653
<CompileCondition="'$(IsLangPack)' == 'true'"Include="component-groups\Runtime_LangPack.wxs" />

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
<MajorUpgradeAllowDowngrades="no"DowngradeErrorMessage="A newer version of this product is already installed."Schedule="afterInstallInitialize" />
1515
<MediaTemplateEmbedCab="yes" />
1616

17-
<FeatureId="Compiler_Feature"
18-
AllowAdvertise="no"
19-
Description="Installs the Visual F# programming language and all associated components."
20-
Title="Visual F#">
21-
22-
<?if $(var.IsLangPack) = true ?>
23-
<ComponentGroupRefId="Compiler_LangPack" />
24-
<?else ?>
25-
<ComponentGroupRefId="Compiler_Redist" />
26-
<?endif ?>
27-
</Feature>
28-
2917
<FeatureId="Runtime_Feature"
3018
Title="Microsoft Visual F# Runtime for .NET"
3119
Description="Runtime components for F# compiled binaries."

‎setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs‎

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp