Skip to content

Commit

Permalink
Migrate installer from Setup Project to WiX 3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
timetheoretical committed Jun 3, 2020
1 parent e953411 commit a577926
Show file tree
Hide file tree
Showing 13 changed files with 714 additions and 2,015 deletions.
33 changes: 27 additions & 6 deletions JitsiMeetOutlook.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,42 @@ VisualStudioVersion = 16.0.30002.166
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitsiMeetOutlook", "JitsiMeetOutlook\JitsiMeetOutlook.csproj", "{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "setup", "setup\setup.vdproj", "{C9B130DB-0B4D-45A3-891B-224383D4B074}"
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "setup", "setup\setup.wixproj", "{85009CC8-078D-40E6-B4A5-F097D6B04C72}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsInstallerParameters", "SettingsInstallerParameters\SettingsInstallerParameters.csproj", "{1963A813-D744-49E1-B08B-9DB661C8850E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|Any CPU.Build.0 = Release|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|x86.ActiveCfg = Debug|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Debug|x86.Build.0 = Debug|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Release|Any CPU.Build.0 = Release|Any CPU
{C9B130DB-0B4D-45A3-891B-224383D4B074}.Debug|Any CPU.ActiveCfg = Release
{C9B130DB-0B4D-45A3-891B-224383D4B074}.Debug|Any CPU.Build.0 = Release
{C9B130DB-0B4D-45A3-891B-224383D4B074}.Release|Any CPU.ActiveCfg = Release
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Release|x86.ActiveCfg = Release|Any CPU
{92DD44F5-9B8C-4D40-AE0E-9B1EDEE99449}.Release|x86.Build.0 = Release|Any CPU
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Debug|Any CPU.ActiveCfg = Debug|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Debug|Any CPU.Build.0 = Debug|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Debug|x86.ActiveCfg = Debug|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Debug|x86.Build.0 = Debug|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Release|Any CPU.ActiveCfg = Release|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Release|Any CPU.Build.0 = Release|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Release|x86.ActiveCfg = Release|x86
{85009CC8-078D-40E6-B4A5-F097D6B04C72}.Release|x86.Build.0 = Release|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Debug|Any CPU.ActiveCfg = Debug|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Debug|Any CPU.Build.0 = Debug|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Debug|x86.ActiveCfg = Debug|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Debug|x86.Build.0 = Debug|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Release|Any CPU.ActiveCfg = Release|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Release|Any CPU.Build.0 = Release|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Release|x86.ActiveCfg = Release|x86
{1963A813-D744-49E1-B08B-9DB661C8850E}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
36 changes: 0 additions & 36 deletions JitsiMeetOutlook/Installer1.Designer.cs

This file was deleted.

147 changes: 0 additions & 147 deletions JitsiMeetOutlook/Installer1.cs

This file was deleted.

27 changes: 21 additions & 6 deletions JitsiMeetOutlook/JitsiMeetOutlook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<!--
This section specifies references for the project.
Expand Down Expand Up @@ -243,12 +244,6 @@
<Compile Include="FormSettings.Designer.cs">
<DependentUpon>FormSettings.cs</DependentUpon>
</Compile>
<Compile Include="Installer1.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Installer1.Designer.cs">
<DependentUpon>Installer1.cs</DependentUpon>
</Compile>
<Compile Include="JitsiUrl.cs" />
<Compile Include="NewJitsiAppointment.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
Expand Down Expand Up @@ -276,6 +271,7 @@
<EmbeddedResource Include="Resources\languages.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>languages.Designer.cs</LastGenOutput>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<None Include="app.config" />
<None Include="cert.pfx" />
Expand All @@ -296,6 +292,7 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>languages.resx</DependentUpon>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="ThisAddIn.cs">
<SubType>Code</SubType>
Expand Down Expand Up @@ -328,6 +325,24 @@
<PropertyGroup>
<ManifestCertificateThumbprint>F4E4049A921B2B6BF8CFDC4D45C0F9F37AD041AB</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>VSTO40;DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>VSTO40;TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<!-- Include the build rules for a C# project. -->
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- Include additional build rules for an Office application add-in. -->
Expand Down
32 changes: 32 additions & 0 deletions SettingsInstallerParameters/CustomAction.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">

<!--
Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
the custom action should run on. If no versions are specified, the chosen version of the runtime
will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
only the version(s) of the .NET Framework runtime that you have tested against.
Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies
by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-->

<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727"/>

</startup>

<!--
Add additional configuration settings here. For more information on application config files,
see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-->

</configuration>
Loading

0 comments on commit a577926

Please sign in to comment.