Skip to content

Commit f0c70bd

Browse files
ryannewingtonryannewington
committed
Bump version to 2.1
Increase installer dependency for MIM 2016 and .NET 4.7.2
1 parent 8b0fad8 commit f0c70bd

File tree

5 files changed

+111
-8
lines changed

5 files changed

+111
-8
lines changed

‎src/Lithnet.GoogleApps.MA.Setup/Lithnet.GoogleApps.MA.Setup.wixproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@
2222
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2323
</PropertyGroup>
2424
<ItemGroup>
25+
<Compile Include="netfx472.wxs" />
2526
<Compile Include="Product.wxs" />
2627
</ItemGroup>
2728
<ItemGroup>
29+
<WixExtension Include="WixUtilExtension">
30+
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
31+
<Name>WixUtilExtension</Name>
32+
</WixExtension>
2833
<WixExtension Include="WixUIExtension">
2934
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
3035
<Name>WixUIExtension</Name>

‎src/Lithnet.GoogleApps.MA.Setup/Product.wxs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
<!-- Prerequisites -->
1919

20-
<PropertyRef Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" />
20+
<PropertyRef Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" />
2121

22-
<Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again">
23-
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED]]>
22+
<Condition Message="This application requires .NET Framework 4.7.2. Please install the .NET Framework then run this installer again">
23+
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED]]>
2424
</Condition>
2525

2626
<Property Id="FIMINSTALLDIR" Secure="yes">
@@ -30,12 +30,12 @@
3030
<Property Id="SYNCVERSION" Secure="yes">
3131
<DirectorySearch Id="MiiserverVersion" Path="[FIMINSTALLDIR]">
3232
<DirectorySearch Id="binFolder" AssignToProperty="no" Path="bin">
33-
<FileSearch Name="miiserver.exe" MinVersion="4.1.3441.0" />
33+
<FileSearch Name="miiserver.exe" MinVersion="4.3" />
3434
</DirectorySearch>
3535
</DirectorySearch>
3636
</Property>
3737

38-
<Condition Message="This application requires Microsoft Forefront Identity Manager 2010 R2 4.1.3441 or later to be installed">
38+
<Condition Message="This application requires Microsoft Identity Manager 2016 or later to be installed">
3939
<![CDATA[Installed OR SYNCVERSION]]>
4040
</Condition>
4141

‎src/Lithnet.GoogleApps.MA.Setup/netfx472.wxs‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3+
4+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
5+
6+
<!--
7+
.NET Framework installation state properties
8+
Official documentation can be found at the following location:
9+
.NET Framework 4.5.x/4.6.x/4.7.x - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
10+
-->
11+
12+
<?define NetFx472MinRelease = 461808 ?>
13+
<?define NetFx472WebLink = https://go.microsoft.com/fwlink/?LinkId=863262 ?>
14+
<?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863258 ?>
15+
<?define NetFx472EulaLink = https://referencesource.microsoft.com/license.html ?>
16+
17+
<Fragment>
18+
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
19+
<Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />
20+
<SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch">
21+
WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx472MinRelease)"
22+
</SetProperty>
23+
</Fragment>
24+
25+
<Fragment>
26+
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
27+
28+
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Web" />
29+
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
30+
<WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
31+
<WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
32+
<WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
33+
34+
<PackageGroup Id="NetFx472Web">
35+
<ExePackage
36+
InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
37+
RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
38+
UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
39+
PerMachine="yes"
40+
DetectCondition="!(wix.NetFx472WebDetectCondition)"
41+
InstallCondition="!(wix.NetFx472WebInstallCondition)"
42+
Id="NetFx472Web"
43+
Vital="yes"
44+
Permanent="yes"
45+
Protocol="netfx4"
46+
DownloadUrl="$(var.NetFx472WebLink)"
47+
LogPathVariable="NetFx472WebLog"
48+
Compressed="no"
49+
Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
50+
<RemotePayload
51+
CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
52+
CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
53+
Description="Microsoft .NET Framework 4.7.2 Setup"
54+
Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
55+
ProductName="Microsoft .NET Framework 4.7.2"
56+
Size="1432848"
57+
Version="4.7.3081.0" />
58+
</ExePackage>
59+
</PackageGroup>
60+
</Fragment>
61+
62+
<Fragment>
63+
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
64+
65+
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Redist" />
66+
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
67+
<WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
68+
<WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
69+
<WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
70+
71+
<PackageGroup Id="NetFx472Redist">
72+
<ExePackage
73+
InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
74+
RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
75+
UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
76+
PerMachine="yes"
77+
DetectCondition="!(wix.NetFx472RedistDetectCondition)"
78+
InstallCondition="!(wix.NetFx472RedistInstallCondition)"
79+
Id="NetFx472Redist"
80+
Vital="yes"
81+
Permanent="yes"
82+
Protocol="netfx4"
83+
DownloadUrl="$(var.NetFx472RedistLink)"
84+
LogPathVariable="NetFx472RedistLog"
85+
Compressed="no"
86+
Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
87+
<RemotePayload
88+
CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
89+
CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
90+
Description="Microsoft .NET Framework 4.7.2 Setup"
91+
Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
92+
ProductName="Microsoft .NET Framework 4.7.2"
93+
Size="83943272"
94+
Version="4.7.3081.0" />
95+
</ExePackage>
96+
</PackageGroup>
97+
</Fragment>
98+
</Wix>

‎src/Lithnet.GoogleApps.MA/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// You can specify all the values or you can default the Revision and Build Numbers
3232
// by using the '*' as shown below:
3333

34-
[assembly: AssemblyVersion("2.0.*")]
34+
[assembly: AssemblyVersion("2.1.*")]
3535

3636
//
3737
// In order to sign your assembly you must specify a key to use. Refer to the

‎src/Lithnet.GoogleApps.MA/Lithnet.GoogleApps.MA.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@
310310
<ItemGroup />
311311
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
312312
<PropertyGroup>
313-
<PreBuildEvent>REM del $(ProjectDir)$(ProjectName).PackagedMA.xml /f
314-
REM "C:\Program Files\Microsoft Forefront Identity Manager\2010\Synchronization Service\Bin\mapackager.exe" /e:$(ProjectDir)ExportedMA.xml /c:$(ProjectDir)MAPackageInformation.xml /o:$(ProjectDir)$(ProjectName).PackagedMA.xml</PreBuildEvent>
313+
<PreBuildEvent>del $(ProjectDir)$(ProjectName).PackagedMA.xml /f
314+
"C:\Program Files\Microsoft Forefront Identity Manager\2010\Synchronization Service\Bin\mapackager.exe" /e:$(ProjectDir)ExportedMA.xml /c:$(ProjectDir)MAPackageInformation.xml /o:$(ProjectDir)$(ProjectName).PackagedMA.xml</PreBuildEvent>
315315
<PostBuildEvent>call %25BuildToolsPath%25\sign-and-save-symbols.bat $(TargetPath) $(TargetDir) $(ProjectName)</PostBuildEvent>
316316
</PropertyGroup>
317317
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

0 commit comments

Comments
 (0)