With windows logos (VisualElementsManifest)

SizeOnDisk/Properties/AssemblyInfo.cs

@@ -58,5 +58,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.11.1.42")]
-[assembly: AssemblyFileVersion("2.11.1.42")]
+[assembly: AssemblyVersion("2.12.4.42")]
+[assembly: AssemblyFileVersion("2.12.4.42")]

SizeOnDisk/Shell/LittleFileInfo.cs

@@ -13,7 +13,7 @@ public class LittleFileInfo
 
         internal LittleFileInfo(string path, string filename)
         {
-            FileName = FileName;
+            FileName = filename;
             Path = path;
             FullPath = filename;
             if (string.IsNullOrEmpty(path))

SizeOnDisk/Shell/ReparsePoint.cs

@@ -467,7 +467,7 @@ public ReparsePoint(string path)
                             }
                             //Debug.Assert(!(string.IsNullOrEmpty(subsString) && string.IsNullOrEmpty(printString)), "Failed to retrieve parse point");
                             // the printstring should give us what we want
-                            if (!string.IsNullOrEmpty(printString))
+                            if (printString.Length > 0)
                             {
                                 normalisedTarget = printString;
                             }

SizeOnDisk/SizeOnDisk.VisualElementsManifest.xml

@@ -1,13 +1,11 @@
 <Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
   <VisualElements
-   DisplayName = "SizeOnDisk"
- Logo="WinAssets\LockScreenLogo.png" 
-        SmallLogo="WinAssets\LockScreenLogo.png" 
-        Description="Some text here" 
+      DisplayName='SizeOnDisk'
+      Description='Get size of your files'
       ShowNameOnSquare150x150Logo='on'
-      Square70x70Logo='WinAssets\Square71x71Logo.png'
+      Square70x70Logo='WinAssets\Square70x70Logo.png'
       Square150x150Logo='WinAssets\Square150x150Logo.png'
-      Square310x310Logo='WinAssets\Square310x310Logo.png'
       ForegroundText='light'
-      BackgroundColor='teal'/>
+      BackgroundColor='#383932'
+   />
 </Application>

SizeOnDisk/SizeOnDisk.csproj

@@ -420,7 +420,9 @@
     <Resource Include="Icons\Select.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="SizeOnDisk.VisualElementsManifest.xml" />
+    <None Include="SizeOnDisk.VisualElementsManifest.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="Medias\Folder.svg" />
@@ -454,6 +456,20 @@
     <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <None Include="WinAssets\Logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="WinAssets\Square150x150Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="WinAssets\Square70x70Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

SizeOnDisk/ViewModel/VMFileDetails.cs

@@ -343,7 +343,7 @@ private void FillProperties()
                         }
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                 }
             }

SizeOnDiskSetup/Product.wxs

@@ -12,7 +12,7 @@
            Manufacturer="Sebastien Gariepy ([email protected])"
            UpgradeCode="9d3f227e-e788-4982-a15a-056152359ef6">
     <Package Description="SizeOnDisk !(bind.FileVersion.ApplicationFile)"
-           Manufacturer="Sebastien Gariepy ([email protected])"
+             Manufacturer="Sebastien Gariepy ([email protected])"
              InstallerVersion="200"
              Compressed="yes"
              InstallPrivileges='elevated'
@@ -229,6 +229,45 @@
               KeyPath="yes" />
       </Component>
     </DirectoryRef>
+    <DirectoryRef Id="APPLICATIONFOLDER">
+      <Component Id="VisualElementsManifestComponent"
+                 Guid="*">
+        <File Id="VisualElementsManifestFile"
+              Name="SizeOnDisk.VisualElementsManifest.xml"
+              DiskId="1"
+              Source="$(var.SizeOnDisk.TargetDir)SizeOnDisk.VisualElementsManifest.xml"
+              KeyPath="yes"
+              Checksum="yes"
+              Vital="no" />
+      </Component>
+      <Directory Id="WinAssets"
+                 Name="WinAssets">
+        <Component Id="Logo70Component"
+                   Guid="*">
+          <CreateFolder />
+          <RemoveFile Id="AllWinAssets"
+                      Name="*.*"
+                      On="both" />
+          <File Id="Logo70File"
+                Name="Square70x70Logo.png"
+                DiskId="1"
+                Source="$(var.SizeOnDisk.TargetDir)WinAssets\Square70x70Logo.png"
+                KeyPath="yes"
+                Checksum="yes"
+                Vital="no" />
+        </Component>
+        <Component Id="Logo150Component"
+                   Guid="*">
+          <File Id="Logo150File"
+                Name="Square150x150Logo.png"
+                DiskId="1"
+                Source="$(var.SizeOnDisk.TargetDir)WinAssets\Square150x150Logo.png"
+                KeyPath="yes"
+                Checksum="yes"
+                Vital="no" />
+        </Component>
+      </Directory>
+    </DirectoryRef>
     <DirectoryRef Id="APPLICATIONFOLDER">
       <Directory Id="de"
                  Name="de">
@@ -367,8 +406,11 @@
         </Component>
       </Directory>
     </DirectoryRef>
-    <Feature Id="AllFeatures" Display="expand" Title="SizeOnDisk"
-             AllowAdvertise="no" Level="1">
+    <Feature Id="AllFeatures"
+             Display="expand"
+             Title="SizeOnDisk"
+             AllowAdvertise="no"
+             Level="1">
       <Feature Id="ProductFeature"
                Absent="disallow"
                Title="Required files"
@@ -395,6 +437,14 @@
                Level="1">
         <ComponentRef Id="ApplicationFileDesktopShortcutComponent" />
       </Feature>
+      <Feature Id="WindowsLogosFeature"
+               Title="Windows menu logos"
+               AllowAdvertise="no"
+               Level="1">
+        <ComponentRef Id="VisualElementsManifestComponent" />
+        <ComponentRef Id="Logo70Component" />
+        <ComponentRef Id="Logo150Component" />
+      </Feature>
       <Feature Id="ConfigurationFeature"
                Title="Configuration file"
                Level="2"
@@ -588,7 +638,8 @@
                   Return="check"
                   Execute="immediate"
                   BinaryKey="WixTools.CA.dll"
-                  DllEntry="GetLanguages" Impersonate="yes" />
+                  DllEntry="GetLanguages"
+                  Impersonate="yes" />
 
     <Property Id="WixShellExecTarget"
               Value="[#ApplicationFile]" />

SizeOnDiskSetup/createzips.cmd

@@ -1,7 +1,13 @@
 if not exist FinalMasterInstaller md FinalMasterInstaller
 del /q FinalMasterInstaller\*.zip
 
-del /q ..\..\..\SizeOnDisk\bin\Release\*.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\SizeOnDisk.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\WPFByYourCommand.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\WPFLocalizeExtension.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\XAMLMarkupExtensions.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\System.Collections.Immutable.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\WinProps.xml
+del /q ..\..\..\SizeOnDisk\bin\Release\GongSolutions.WPF.DragDrop.xml
 
 md SizeOnDiskFull
 del /s /q SizeOnDiskFull