Skip to content

Commit 1257b3e

Browse files
author
Omar Tawfik
committed
Merged LangPack to Vsix swixproj
1 parent 9c29786 commit 1257b3e

File tree

9 files changed

+69
-91
lines changed

9 files changed

+69
-91
lines changed

‎setup/Swix/Microsoft.FSharp.LangPack/Microsoft.FSharp.LangPack.swixproj‎

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

setup/Swix/Microsoft.FSharp.Vsix/Files.swr renamed to setup/Swix/Microsoft.FSharp.Vsix/Core.Files.swr

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ use vs
33
package name=Microsoft.FSharp.VSIX.$(VSSku)
44
version=4.1
55
vs.package.type=vsix
6-
vs.package.language=neutral
6+
vs.package.language=$(LocaleRegion)
77

88
vs.dependencies
9-
vs.dependency id=Microsoft.FSharp.LangPack.$(VSSku)
10-
version=4.1
11-
type=Required
12-
139
vs.dependency id=Microsoft.FSharp.Dependencies
1410
version=4.1
1511
type=Required

setup/Swix/Microsoft.FSharp.LangPack/DesktopTemplates.swr renamed to setup/Swix/Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
use vs
22

3-
package name=Microsoft.FSharp.LangPack.$(VSSku)
3+
package name=Microsoft.FSharp.VSIX.$(VSSku)
44
version=4.1
55
vs.package.language=$(LocaleRegion)
66

7+
vs.dependencies
8+
vs.dependency id=Microsoft.FSharp.Dependencies
9+
version=4.1
10+
type=Required
11+
12+
vs.dependency id=Microsoft.FSharp.SDK
13+
version=4.1
14+
type=Required
15+
716
folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject"
817
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config"
918
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\AssemblyInfo.fs"

setup/Swix/Microsoft.FSharp.LangPack/Files.swr renamed to setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
use vs
22

3-
package name=Microsoft.FSharp.LangPack.$(VSSku)
3+
package name=Microsoft.FSharp.VSIX.$(VSSku)
44
version=4.1
55
vs.package.language=$(LocaleRegion)
66

7+
vs.dependencies
8+
vs.dependency id=Microsoft.FSharp.Dependencies
9+
version=4.1
10+
type=Required
11+
12+
vs.dependency id=Microsoft.FSharp.SDK
13+
version=4.1
14+
type=Required
15+
716
folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleRegion)"
817
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
918

setup/Swix/Microsoft.FSharp.LangPack/FullTemplates.swr renamed to setup/Swix/Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
use vs
22

3-
package name=Microsoft.FSharp.LangPack.$(VSSku)
3+
package name=Microsoft.FSharp.VSIX.$(VSSku)
44
version=4.1
55
vs.package.language=$(LocaleRegion)
66

7+
vs.dependencies
8+
vs.dependency id=Microsoft.FSharp.Dependencies
9+
version=4.1
10+
type=Required
11+
12+
vs.dependency id=Microsoft.FSharp.SDK
13+
version=4.1
14+
type=Required
15+
716
folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject"
817
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config"
918
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\AssemblyInfo.fs"

setup/Swix/Microsoft.FSharp.LangPack/WebTemplates.swr renamed to setup/Swix/Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
use vs
22

3-
package name=Microsoft.FSharp.LangPack.$(VSSku)
3+
package name=Microsoft.FSharp.VSIX.$(VSSku)
44
version=4.1
55
vs.package.language=$(LocaleRegion)
66

7+
vs.dependencies
8+
vs.dependency id=Microsoft.FSharp.Dependencies
9+
version=4.1
10+
type=Required
11+
12+
vs.dependency id=Microsoft.FSharp.SDK
13+
version=4.1
14+
type=Required
15+
716
folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject"
817
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs"
918
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.fsproj"

‎setup/Swix/Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,40 @@
44
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
55
<OutputArchitecture>neutral</OutputArchitecture>
66
<OutputLocalized>false</OutputLocalized>
7-
<OutputType>manifest</OutputType>
87
<IsPackage>true</IsPackage>
98
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
109
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
1110
<OutputPath>$(BinariesFolder)\insertion</OutputPath>
12-
<OutputName>Microsoft.FSharp.VSIX.$(VSSku)</OutputName>
11+
<OutputName>Microsoft.FSharp.VSIX.$(VSSku).$(LocaleCode)</OutputName>
1312
<IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
1413
</PropertyGroup>
14+
15+
<PropertyGroup Condition="'$(IsLangPack)' == 'false'">
16+
<OutputType>manifest</OutputType>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(IsLangPack)' == 'true'">
20+
<OutputType>vsix</OutputType>
21+
</PropertyGroup>
1522

1623
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
1724

1825
<PropertyGroup>
1926
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2027
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSSku=$(VSSku)</PackagePreprocessorDefinitions>
28+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
29+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
30+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion)</PackagePreprocessorDefinitions>
31+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
2132
</PropertyGroup>
2233

23-
<ItemGroup>
24-
<Package Include="Files.swr" />
34+
<ItemGroup Condition="'$(IsLangPack)' == 'false'">
35+
<Package Include="Core.Files.swr" />
36+
</ItemGroup>
37+
38+
<ItemGroup Condition="'$(IsLangPack)' == 'true'">
39+
<Package Include="LangPack.Files.swr" />
40+
<Package Include="LangPack.$(VSSku).Templates.swr" />
2541
</ItemGroup>
2642

2743
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
@@ -30,5 +46,9 @@
3046

3147
<Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
3248
<Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
49+
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
50+
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
51+
<Error Condition="'$(LocaleRegion)' == ''" Text="A 'LocaleRegion' property must be passed to the project." />
52+
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
3353
</Target>
3454
</Project>

‎setup/Swix/Microsoft.FSharp.vsmanproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
<Target Name="IncludeManifests" BeforeTargets="MergeManifests">
1717
<ItemGroup>
1818
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.%(SetupLanguages.LocaleCode).json" />
19-
20-
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.json" />
19+
<!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix.swixproj -->
20+
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.%(SetupLanguages.LocaleCode).json" />
2121
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
22-
23-
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.LangPack.Full.%(SetupLanguages.LocaleCode).json"
24-
Condition="'%(SetupLanguages.IsLangPack)' == 'true'" />
2522
</ItemGroup>
2623
</Target>
2724
</Project>

‎setup/fsharp-setup-build.proj‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,18 @@
3030
TaskParameter="Include"/>
3131
</CreateItem>
3232

33-
<CreateItem Include="@(SetupLanguages)"
34-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.LangPack\Microsoft.FSharp.LangPack.swixproj;VSSku=Full"
35-
Condition="'%(SetupLanguages.IsLangPack)' == 'true'">
36-
<Output ItemName="SetupProjects"
37-
TaskParameter="Include"/>
38-
</CreateItem>
33+
<!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix.swixproj -->
3934

40-
<!--
4135
<CreateItem Include="@(SetupLanguages)"
42-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.LangPack\Microsoft.FSharp.LangPack.swixproj;VSSku=Desktop"
43-
Condition="'%(SetupLanguages.IsLangPack)' == 'true'">
36+
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj;VSSku=Full">
4437
<Output ItemName="SetupProjects"
4538
TaskParameter="Include"/>
4639
</CreateItem>
4740

48-
<CreateItem Include="@(SetupLanguages)"
49-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.LangPack\Microsoft.FSharp.LangPack.swixproj;VSSku=Web"
50-
Condition="'%(SetupLanguages.IsLangPack)' == 'true'">
51-
<Output ItemName="SetupProjects"
52-
TaskParameter="Include"/>
53-
</CreateItem>
54-
-->
5541
<ItemGroup>
5642
<SetupProjects Include="Microsoft.FSharp.Dependencies.swixproj">
5743
<ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
5844
</SetupProjects>
59-
<SetupProjects Include="Microsoft.FSharp.Vsix.swixproj">
60-
<ProjectPath>Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj</ProjectPath>
61-
<VSSku>Full</VSSku>
62-
</SetupProjects>
63-
<!--
64-
<SetupProjects Include="Microsoft.FSharp.Vsix.swixproj">
65-
<ProjectPath>Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj</ProjectPath>
66-
<VSSku>Desktop</VSSku>
67-
</SetupProjects>
68-
<SetupProjects Include="Microsoft.FSharp.Vsix.swixproj">
69-
<ProjectPath>Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj</ProjectPath>
70-
<VSSku>Web</VSSku>
71-
</SetupProjects>
72-
-->
7345
<SetupProjects Include="Microsoft.FSharp.vsmanproj">
7446
<ProjectPath>Swix\Microsoft.FSharp.vsmanproj</ProjectPath>
7547
</SetupProjects>

0 commit comments

Comments
 (0)