commit: More friendly UI; add ILRepack for release

FileExpander/FileExpander.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="C:\NuGetLocalRepo\ILRepack.2.0.18\build\ILRepack.props" Condition="Exists('C:\NuGetLocalRepo\ILRepack.2.0.18\build\ILRepack.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -68,6 +71,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -82,4 +86,15 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('C:\NuGetLocalRepo\ILRepack.2.0.18\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', 'C:\NuGetLocalRepo\ILRepack.2.0.18\build\ILRepack.props'))" />
+  </Target>
+  <PropertyGroup>
+    <PostBuildEvent>if $(ConfigurationName) == Release if not exist "$(TargetDir)Packed" md "$(TargetDir)Packed"
+if $(ConfigurationName) == Release $(ILRepack) /ndebug "/out:$(TargetDir)Packed\$(TargetFileName)" "$(TargetPath)"
+if $(ConfigurationName) == Release if exist "$(TargetDir)Packed\$(TargetFileName).config" del "$(TargetDir)Packed\$(TargetFileName).config"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

FileExpander/FileExpanderForm.Designer.cs

@@ -129,6 +129,7 @@ namespace FileExpander
             0,
             0,
             0});
+            this.ExpandNumericUpDown.ValueChanged += new System.EventHandler(this.ExpandNumericUpDown_ValueChanged);
             // 
             // KbRadioButton
             // 

FileExpander/FileExpanderForm.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Runtime.Remoting.Messaging;
 using System.Windows.Forms;
 using File = System.IO.File;
 
@@ -12,13 +11,15 @@ namespace FileExpander
         private const int Megabyte = Kilobyte * 1024;
         private const int Gigabyte = Megabyte * 1024;
 
+        private string _selectedFile;
+
         public FileExpanderForm() => InitializeComponent();
 
         private void SelectButton_Click(object sender, EventArgs e)
         {
             using var dlg = new OpenFileDialog { Title = "Select file to expand", CheckFileExists = true };
             if (dlg.ShowDialog() != DialogResult.OK) return;
-            FileValueLabel.Text = dlg.FileName;
+            _selectedFile = FileValueLabel.Text = dlg.FileName;
             UpdateDisplay();
         }
 
@@ -32,7 +33,12 @@ namespace FileExpander
 
         private void FileValueLabel_DragDrop(object sender, DragEventArgs e)
         {
-            FileValueLabel.Text = ((string[])e.Data.GetData(DataFormats.FileDrop))[0];
+            _selectedFile = FileValueLabel.Text = ((string[])e.Data.GetData(DataFormats.FileDrop))[0];
+            UpdateDisplay();
+        }
+
+        private void ExpandNumericUpDown_ValueChanged(object sender, EventArgs e)
+        {
             UpdateDisplay();
         }
 
@@ -45,7 +51,19 @@ namespace FileExpander
 
         private void GoButton_Click(object sender, EventArgs e)
         {
-            using var fs = new FileStream(FileValueLabel.Text, FileMode.Open, FileAccess.Write, FileShare.None);
+            if (null == _selectedFile)
+            {
+                MessageBox.Show("No file selected!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (!File.Exists(_selectedFile))
+            {
+                MessageBox.Show("No such file!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            using var fs = new FileStream(_selectedFile, FileMode.Open, FileAccess.Write, FileShare.None);
             fs.SetLength(fs.Length + GetExpand());
             fs.Close();
             MessageBox.Show("Success");
@@ -56,8 +74,14 @@ namespace FileExpander
 
         private void UpdateDisplay()
         {
-            var file = FileValueLabel.Text;
-            if (!File.Exists(file))
+            if (null == _selectedFile)
+            {
+                SizeValueLabel.Text = "⚠ No file selected";
+                AfterExpandValueLabel.Text = "";
+                return;
+            }
+
+            if (!File.Exists(_selectedFile))
             {
                 SizeValueLabel.Text = "⚠ No such file";
                 AfterExpandValueLabel.Text = "";
@@ -68,7 +92,7 @@ namespace FileExpander
             try
             {
                 //get real file size
-                using var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using var fs = new FileStream(_selectedFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
                 size = fs.Length;
                 fs.Close();
             }
@@ -121,7 +145,5 @@ namespace FileExpander
             var result = String.Format("{0:0.##} {1}", len, sizes[order]);
             return result;
         }
-
-
     }
 }

FileExpander/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ILRepack" version="2.0.18" targetFramework="net472" />
+</packages>