Skip to content

Commit 98d2711

Browse files
author
Omar Tawfik
committed
Address PR comments
1 parent 8ec741e commit 98d2711

File tree

19 files changed

+31
-25
lines changed

19 files changed

+31
-25
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 Condition="'$(IsLangPack)' == 'false'">Microsoft.FSharp.SDK.Core</OutputName>
13+
<OutputName Condition="'$(IsLangPack)' != 'true'">Microsoft.FSharp.SDK.Core</OutputName>
1414
<OutputName Condition="'$(IsLangPack)' == 'true'">Microsoft.FSharp.SDK.Resources.$(LocaleCode)</OutputName>
1515
<ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
1616
<OutputType>Package</OutputType>

‎setup/FSharp.Setup.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProductVersion>3.10</ProductVersion>
7+
<FSharpPackageVersion>4.1</FSharpPackageVersion>
78
<WiXToolset2015Version>3.10.0.1503</WiXToolset2015Version>
89
<WixInstallPath>$(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix</WixInstallPath>
910
<NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>

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

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

33
package name=Microsoft.FSharp.Dependencies
4-
version=4.1
4+
version=$(FSharpPackageVersion)
55

66
vs.dependencies
77
vs.dependency id=Microsoft.FSharp.SDK.Core
8-
version=4.1
8+
version=$(FSharpPackageVersion)
99
type=Required
1010

1111
vs.dependency id=Microsoft.FSharp.SDK.Resources
12-
version=4.1
12+
version=$(FSharpPackageVersion)
1313
type=Required
1414

1515
vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
16-
version=4.1
16+
version=$(FSharpPackageVersion)
1717
type=Required
1818
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
1919

2020
vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
21-
version=4.1
21+
version=$(FSharpPackageVersion)
2222
type=Required
2323
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
2424

2525
vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Core
26-
version=4.1
26+
version=$(FSharpPackageVersion)
2727
type=Required
2828
when=Microsoft.VisualStudio.Product.DesktopExpress
2929

3030
vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Resources
31-
version=4.1
31+
version=$(FSharpPackageVersion)
3232
type=Required
3333
when=Microsoft.VisualStudio.Product.DesktopExpress
3434

3535
vs.dependency id=Microsoft.FSharp.VSIX.Web.Core
36-
version=4.1
36+
version=$(FSharpPackageVersion)
3737
type=Required
3838
when=Microsoft.VisualStudio.Product.WebExpress
3939

4040
vs.dependency id=Microsoft.FSharp.VSIX.Web.Resources
41-
version=4.1
41+
version=$(FSharpPackageVersion)
4242
type=Required
4343
when=Microsoft.VisualStudio.Product.WebExpress

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

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

33
package name=Microsoft.FSharp.Dependencies
4-
version=4.1
4+
version=$(FSharpPackageVersion)
55

66
folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
77
file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<PropertyGroup>
2020
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
22+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2223
</PropertyGroup>
2324

2425
<ItemGroup>

‎setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr‎

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

33
package name=Microsoft.FSharp.SDK.Core
4-
version=4.1
4+
version=$(FSharpPackageVersion)
55
vs.package.type=msi
66

77
vs.payloads

‎setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<PropertyGroup>
1818
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
19+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr‎

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

33
package name=Microsoft.FSharp.SDK.Resources
4-
version=4.1
4+
version=$(FSharpPackageVersion)
55
vs.package.type=msi
66
vs.package.language=$(LocaleRegion)

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr‎

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

33
package name=Microsoft.FSharp.SDK.Resources
4-
version=4.1
4+
version=$(FSharpPackageVersion)
55
vs.package.type=msi
66
vs.package.language=$(LocaleRegion)
77

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616

1717
<PropertyGroup>
1818
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
19+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
1920
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
2021
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
2122
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion)</PackagePreprocessorDefinitions>
2223
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
2324
</PropertyGroup>
2425

25-
<ItemGroup Condition="'$(IsLangPack)' == 'false'">
26+
<ItemGroup Condition="'$(IsLangPack)' != 'true'">
2627
<Package Include="Empty.swr" />
2728
</ItemGroup>
2829

0 commit comments

Comments
 (0)