Skip to content

Upgrade MSI swix build to produce UpgradeCode and InstallSize #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OmarTawfik merged 5 commits into from
Oct 6, 2016
Merged

Upgrade MSI swix build to produce UpgradeCode and InstallSize #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c013cbe
Upgrade MSI swix build to produce UpgradeCode and InstallSize
Oct 5, 2016
f32857c
Depend on VsixInstaller package in F# v2 package
Oct 5, 2016
de87261
Clean up initial targets
Oct 6, 2016
7f8ffb2
Fix zero sizes on other packs
Oct 6, 2016
cc0525f
Fix Rebuild not found target error
Oct 6, 2016
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
2 changes: 1 addition & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
<package id="MicroBuild.Core" version="0.2.0" />
<package id="MicroBuild.Core.Sentinel" version="1.0.0" />
<package id="MicroBuild.Plugins.SwixBuild" version="1.0.43" />
<package id="MicroBuild.Plugins.SwixBuild" version="1.0.60" />
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions setup/FSharp.SDK/FSharp.SDK.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project InitialTargets="CheckPropertiesArePassed" ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
<SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
Expand Down Expand Up @@ -64,7 +64,7 @@
<Import Project="$(WixInstallPath)\wix.targets" />
<Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />

<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
Expand Down
7 changes: 6 additions & 1 deletion setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<OutputArchitecture>neutral</OutputArchitecture>
Expand All @@ -26,6 +27,10 @@
<Package Include="Files.swr" />
<Package Include="Dependencies.swr" />
</ItemGroup>

<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
</Target>

<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
<!-- SWIX plugin adds the built vsix to signing automatically -->
Expand Down
1 change: 1 addition & 0 deletions setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use vs
package name=Microsoft.FSharp.SDK.Core
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.installSize=37223424

vs.payloads
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi"
7 changes: 6 additions & 1 deletion setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<OutputArchitecture>neutral</OutputArchitecture>
Expand All @@ -23,6 +24,10 @@
<ItemGroup>
<Package Include="Files.swr" />
</ItemGroup>

<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
</Target>

<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
<!-- MSI is already signed before wrapping it here -->
Expand Down
3 changes: 2 additions & 1 deletion setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ use vs

package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.language=$(LocaleSpecificCulture)
vs.package.language=$(LocaleSpecificCulture)
vs.package.installSize=1
1 change: 1 addition & 0 deletions setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.language=$(LocaleSpecificCulture)
vs.package.installSize=13854720

vs.payloads
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi"
6 changes: 4 additions & 2 deletions setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<OutputArchitecture>neutral</OutputArchitecture>
Expand Down Expand Up @@ -38,11 +39,12 @@
<!-- MSI is already signed before wrapping it here -->
</Target>

<Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
<Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
</Target>
</Project>
6 changes: 5 additions & 1 deletion setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Core
version=$(FSharpPackageVersion)
vs.package.type=vsix
vs.package.vsixId=VisualFSharp
vs.package.installSize=32108544

vs.dependencies
vs.dependency id=Microsoft.VisualStudio.MinShell

vs.payloads
vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"
vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"
6 changes: 4 additions & 2 deletions setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<OutputArchitecture>neutral</OutputArchitecture>
Expand Down Expand Up @@ -29,7 +30,8 @@
<!-- SWIX plugin adds the built vsix to signing automatically -->
</Target>

<Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
<Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
</Target>
</Project>
1 change: 1 addition & 0 deletions setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ use vs
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
version=$(FSharpPackageVersion)
vs.package.language=$(LocaleSpecificCulture)
vs.package.installSize=1
6 changes: 4 additions & 2 deletions setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
<OutputArchitecture>neutral</OutputArchitecture>
Expand Down Expand Up @@ -39,12 +40,13 @@
<!-- SWIX plugin adds the built vsix to signing automatically -->
</Target>

<Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
<Target Name="CheckPropertiesArePassed">
<Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
<Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
</Target>
</Project>
4 changes: 2 additions & 2 deletions setup/fsharp-setup-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
</Target>

<Target Name="Build" DependsOnTargets="CollectSetupProjects">
<!-- Wix targets files doesn't handle localization parameters correctly. Rebuilding all to clean obj files between languages -->
<!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages -->
<MSBuild Projects="%(SetupProjects.ProjectPath)"
Targets="Rebuild"
Targets="Clean;Build"
Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleParentCulture=%(SetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SetupProjects.LocaleSpecificCulture);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/>
</Target>

Expand Down