Skip to content

Commit 5400076

Browse files
author
Omar Tawfik
committed
Converted back to v2 vsix
1 parent ffe7246 commit 5400076

28 files changed

+913
-391
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Import Project="$(SetupRootFolder)\FSharp.Setup.props" />
1111

1212
<PropertyGroup>
13-
<OutputName>FSharp.SDK</OutputName>
13+
<OutputName>Microsoft.FSharp.SDK</OutputName>
1414
<ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
1515
<OutputType>Package</OutputType>
1616
<Media>net</Media>

‎setup/Swix/Microsoft.FSharp.Dependencies/Files.swr‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
use vs
2+
3+
package name=Microsoft.FSharp.Dependencies
4+
version=4.1
5+
vs.package.chip=neutral
6+
vs.package.language=en-us
7+
8+
folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
9+
file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
10+
file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
11+
12+
folder "InstallDir:Common7\IDE\PublicAssemblies"
13+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
14+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
15+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
16+
17+
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
18+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Conversion.Core.dll"
19+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.dll"
20+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Engine.dll"
21+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Framework.dll"
22+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Tasks.Core.dll"
23+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Utilities.Core.dll"

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
5+
<OutputArchitecture>neutral</OutputArchitecture>
6+
<OutputLocalized>false</OutputLocalized>
7+
<OutputType>vsix</OutputType>
8+
<IsPackage>true</IsPackage>
9+
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
10+
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
11+
<PackagesFolder>$(FSharpSourcesRoot)\..\packages</PackagesFolder>
12+
<OutputPath>$(BinariesFolder)\insertion</OutputPath>
13+
<OutputName>Microsoft.FSharp.Dependencies</OutputName>
14+
<IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
15+
</PropertyGroup>
16+
17+
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
18+
19+
<PropertyGroup>
20+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
21+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<Package Include="Files.swr" />
26+
</ItemGroup>
27+
28+
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
29+
<!-- SWIX plugin adds the built vsix to signing automatically -->
30+
</Target>
31+
</Project>

setup/Swix/VisualFSharpVSIX/LangPack/DesktopTemplates.LangPack.swr renamed to setup/Swix/Microsoft.FSharp.LangPack/DesktopTemplates.swr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

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

setup/Swix/VisualFSharpVSIX/LangPack/CommonFiles.LangPack.swr renamed to setup/Swix/Microsoft.FSharp.LangPack/Files.swr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

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

setup/Swix/VisualFSharpVSIX/LangPack/ProfessionalTemplates.LangPack.swr renamed to setup/Swix/Microsoft.FSharp.LangPack/FullTemplates.swr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

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

setup/Swix/VisualFSharpVSIX/VisualFSharpVSIX.swixproj renamed to setup/Swix/Microsoft.FSharp.LangPack/Microsoft.FSharp.LangPack.swixproj

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<PropertyGroup>
44
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
55
<OutputArchitecture>neutral</OutputArchitecture>
6-
<OutputLocalized>false</OutputLocalized>
6+
<OutputLocalized>true</OutputLocalized>
77
<OutputType>vsix</OutputType>
88
<IsPackage>true</IsPackage>
99
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
1010
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
1111
<OutputPath>$(BinariesFolder)\insertion</OutputPath>
12-
<OutputName>VisualFSharpVSIX.$(VSSku).$(LocaleCode)</OutputName>
12+
<OutputName>Microsoft.FSharp.LangPack.$(VSSku).$(LocaleCode)</OutputName>
1313
<IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
1414
</PropertyGroup>
1515

@@ -25,11 +25,8 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<Package Condition="'$(IsLangPack)' != 'true'" Include="Files\CommonFiles.swr" />
29-
<Package Condition="'$(IsLangPack)' == 'true'" Include="LangPack\CommonFiles.LangPack.swr" />
30-
31-
<Package Condition="'$(IsLangPack)' != 'true'" Include="Files\$(VSSku)Templates.swr" />
32-
<Package Condition="'$(IsLangPack)' == 'true'" Include="LangPack\$(VSSku)Templates.LangPack.swr" />
28+
<Package Include="Files.swr" />
29+
<Package Include="$(VSSku)Templates.swr" />
3330
</ItemGroup>
3431

3532
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">

setup/Swix/VisualFSharpVSIX/LangPack/WebDevelopmentTemplates.LangPack.swr renamed to setup/Swix/Microsoft.FSharp.LangPack/WebTemplates.swr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

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

setup/Swix/FSharp.SDK/Files.swr renamed to setup/Swix/Microsoft.FSharp.SDK/Files.swr

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

3-
package name=Microsoft.FSharp.Msi
3+
package name=Microsoft.FSharp.SDK
44
version=4.1
55
vs.package.type=msi
66
vs.package.chip=neutral
77
vs.package.language=$(LocaleRegion)
88

99
vs.payloads
10-
vs.payload source=$(BinariesFolder)\msi\FSharp.SDK.$(LocaleCode).msi
10+
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.$(LocaleCode).msi"

setup/Swix/FSharp.SDK/FSharp.SDK.swixproj renamed to setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
55
<OutputArchitecture>neutral</OutputArchitecture>
6-
<OutputLocalized>false</OutputLocalized>
6+
<OutputLocalized>true</OutputLocalized>
77
<OutputType>manifest</OutputType>
8-
<OutputName>FSharp.SDK.$(LocaleCode)</OutputName>
8+
<OutputName>Microsoft.FSharp.SDK.$(LocaleCode)</OutputName>
99
<IsPackage>true</IsPackage>
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>

0 commit comments

Comments
 (0)