Added icon to test MSI, formatting changes on the rest

clariuslabs · Jun 2, 2016 · c642c7c · c642c7c
1 parent 5939a7c
commit c642c7c
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 35 deletions.
diff --git a/build.proj b/build.proj
@@ -69,7 +69,7 @@
 		<Error Condition=" '$(TestInstalled)' == 'true' And '$(Configuration)' != 'Release' "
 			   Text="Cannot run integration tests with the installed version because the MSI is only built for the Release configuration, and specified configuration is '$(Configuration)'." />
 		<CallTarget Targets="Install" Condition=" '$(TestInstalled)' == 'true'" />
-		
+
 		<MSBuild Projects="src\Clide.IntegrationTests\Clide.IntegrationTests.csproj" BuildInParallel="false" Targets="GetTargetPath" Properties="$(CommonBuildProperties)">
 			<Output TaskParameter="TargetOutputs" ItemName="IntegrationTestAssembly" />
 		</MSBuild>
@@ -104,7 +104,7 @@
 		<Exec Command='appveyor AddCompilationMessage "Integration Tests Failed: $(Failed)" -Category Error'
 			  Condition=" '$(Failed)' != '0' " />
 	</Target>
-	
+
 	<Target Name="Install" Condition=" Exists('$(Installer)') ">
 		<Exec Command='msiexec /i "$(Installer)" /passive' />
 	</Target>
@@ -145,9 +145,9 @@
 		<PropertyGroup>
 			<Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)</Version>
 		</PropertyGroup>
-        
-        <!-- Update AppVeyor build # to match the actual one being used -->
-        <Exec Command="appveyor UpdateBuild -Version $(Version)" Condition=" '$(APPVEYOR)' == 'true' " />
+
+		<!-- Update AppVeyor build # to match the actual one being used -->
+		<Exec Command="appveyor UpdateBuild -Version $(Version)" Condition=" '$(APPVEYOR)' == 'true' " />
 
 	</Target>
 

diff --git a/icon/256.png b/icon/256.png
diff --git a/icon/Clide.ico b/icon/Clide.ico
diff --git a/src/Clide.IntegrationTests/Clide.IntegrationTests.csproj b/src/Clide.IntegrationTests/Clide.IntegrationTests.csproj
@@ -103,13 +103,13 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
@@ -176,7 +176,6 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Text.Encoding" />
     <Reference Include="System.IO" />
-    <Reference Include="System.Text.IO" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />

diff --git a/src/Clide.Msi/Clide.Msi.targets b/src/Clide.Msi/Clide.Msi.targets
@@ -22,7 +22,7 @@
 		<BuildDependsOn>
 			PrepareConstants;
 			$(BuildDependsOn)
-		</BuildDependsOn>		
+		</BuildDependsOn>
 	</PropertyGroup>
 
 	<Target Name="PrepareConstants" DependsOnTargets="GitVersion">
@@ -37,4 +37,8 @@
 		</PropertyGroup>
 	</Target>
 
+	<Target Name="AfterBuild">
+
+	</Target>
+
 </Project>
diff --git a/src/Clide.Msi/Clide.Msi.wixproj b/src/Clide.Msi/Clide.Msi.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\WiX.3.10.1\build\wix.props" Condition="Exists('..\packages\WiX.3.10.1\build\wix.props')" />
+  <Import Project="..\packages\WiX.3.10.2\build\wix.props" Condition="Exists('..\packages\WiX.3.10.2\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -11,6 +11,9 @@
     <OutputType>Package</OutputType>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <TargetFrameworkIdentifier>WiX</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>$(ProductVersion)</TargetFrameworkVersion>
+    <TargetFrameworkMoniker>$(TargetFrameworkIdentifier),Version=v$(TargetFrameworkVersion)</TargetFrameworkMoniker>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -37,7 +40,8 @@
       <Name>Clide.Installer</Name>
       <Project>{859ed305-ee37-48d6-a1b6-f5d7b30317f1}</Project>
       <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
+      <DoNotHarvest>
+      </DoNotHarvest>
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
@@ -48,8 +52,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WiX.3.10.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.10.1\build\wix.props'))" />
     <Error Condition="!Exists('..\packages\GitInfo.1.1.12\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.1.1.12\build\GitInfo.targets'))" />
+    <Error Condition="!Exists('..\packages\WiX.3.10.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.10.2\build\wix.props'))" />
   </Target>
   <Import Project="..\packages\GitInfo.1.1.12\build\GitInfo.targets" Condition="Exists('..\packages\GitInfo.1.1.12\build\GitInfo.targets')" />
 </Project>
diff --git a/src/Clide.Msi/Product.wxs b/src/Clide.Msi/Product.wxs
@@ -9,6 +9,9 @@
 		<Feature Id="ProductFeature" Title="Clide" Level="1">
 			<ComponentRef Id="Clide" />
 		</Feature>
+
+		<Icon Id="Clide.ico" SourceFile="..\..\icon\Clide.ico" />
+		<Property Id="ARPPRODUCTICON" Value="Clide.ico" />
 	</Product>
 
 	<Fragment>

diff --git a/src/Clide.Msi/packages.config b/src/Clide.Msi/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GitInfo" version="1.1.12" />
-  <package id="WiX" version="3.10.1" />
+  <package id="WiX" version="3.10.2" />
 </packages>
diff --git a/src/Clide.sln b/src/Clide.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clide.UnitTests", "Clide.UnitTests\Clide.UnitTests.csproj", "{196C432A-F34C-44E4-AAA1-E0A43DB8949C}"
 EndProject
@@ -13,12 +13,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{BBE9
 	ProjectSection(SolutionItems) = preProject
 		Package\Clide.Installer.nuspec = Package\Clide.Installer.nuspec
 		Package\Clide.Installer.targets = Package\Clide.Installer.targets
+		Package\Clide.Installer.txt = Package\Clide.Installer.txt
 		Package\Clide.nuspec = Package\Clide.nuspec
 		Package\Clide.targets = Package\Clide.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CE52658-6B13-425E-AA75-0B743CFD4A5A}"
 	ProjectSection(SolutionItems) = preProject
+		..\.editorconfig = ..\.editorconfig
 		..\appveyor.yml = ..\appveyor.yml
 		..\build.cmd = ..\build.cmd
 		..\build.proj = ..\build.proj
@@ -42,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clide", "Clide\Clide.csproj
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Clide.Msi", "Clide.Msi\Clide.Msi.wixproj", "{F4FCA9E5-F9AB-4FB5-B239-F4274C45407B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{8CFB0A06-5E46-48D6-B584-A35A8B9110B0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -116,4 +120,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C9A505CA-F826-473A-8290-B36AF6BE56FB} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0}
+		{859ED305-EE37-48D6-A1B6-F5D7B30317F1} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0}
+		{F4FCA9E5-F9AB-4FB5-B239-F4274C45407B} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0}
+	EndGlobalSection
 EndGlobal
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -20,7 +20,7 @@
 
 partial class ThisAssembly
 {
-	public const string Version = ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch;
+	public const string Version = Git.SemVer.Major + "." + Git.SemVer.Minor + "." + Git.SemVer.Patch;
 	public const string InformationalVersion = Version + "-" + Git.Branch + "+" + Git.Commit;
 }
 

diff --git a/src/Package/Clide.nuspec b/src/Package/Clide.nuspec
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
-    <id>Clide</id>
-    <version>1.0.0</version>
-    <authors>Daniel Cazzulino</authors>
-    <owners>clariuslabs, kzu</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Clide</description>
-    <copyright>Copyright 2012 Clarius Labs</copyright>
-    <dependencies>
-		<!--<dependency id="VSSDK.Shell.11" version="11.0.4" />-->
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\Clide.Interfaces\bin\$Configuration$\Clide.Interfaces.dll" target="lib\net45" />
-    <file src="..\Clide.Interfaces\bin\$Configuration$\Clide.Interfaces.xml" target="lib\net45" />
-	<!-- The targets must match the package Id in order to be automatically imported by NuGet/VS -->
-    <file src="Clide.targets" target="build\Clide.targets" />
-  </files>
+	<metadata>
+		<id>Clide</id>
+		<version>1.0.0</version>
+		<authors>Daniel Cazzulino</authors>
+		<owners>clariuslabs, kzu</owners>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Clide</description>
+		<copyright>Copyright 2012 Clarius Labs</copyright>
+		<dependencies>
+			<!--<dependency id="VSSDK.Shell.11" version="11.0.4" />-->
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="..\Clide.Interfaces\bin\$Configuration$\Clide.Interfaces.dll" target="lib\net45" />
+		<file src="..\Clide.Interfaces\bin\$Configuration$\Clide.Interfaces.xml" target="lib\net45" />
+		<!-- The targets must match the package Id in order to be automatically imported by NuGet/VS -->
+		<file src="Clide.targets" target="build\Clide.targets" />
+	</files>
 </package>
diff --git a/src/Package/Clide.targets b/src/Package/Clide.targets
@@ -1,3 +1,4 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Add stuff here eventually -->
+	<!-- Add stuff here eventually -->
+
 </Project>