Merge pull request #11 from Rillke/3.5.0.1

3.5.0.1
Rillke · Jul 12, 2020 · 8f008f5 · 8f008f5
2 parents 3fdb385 + 1be291e
commit 8f008f5
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 10 deletions.
diff --git a/source/Contact-Conversion-Wizard.csproj b/source/Contact-Conversion-Wizard.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="packages\ILRepack.2.0.18\build\ILRepack.props" Condition="Exists('packages\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>
@@ -11,6 +12,25 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <SupportUrl>https://github.com/Rillke/Contact-Conversion-Wizard</SupportUrl>
+    <ProductName>Contact Conversion Wizard</ProductName>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>3.5.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +51,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>CCW-Large.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Google.GData.Client, Version=2.2.0.0, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL">
       <HintPath>packages\Google.GData.Client.2.2.0.0\lib\Google.GData.Client.dll</HintPath>
@@ -123,5 +146,25 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="CCW-Large.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <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\ILRepack.2.0.18\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.2.0.18\build\ILRepack.props'))" />
+  </Target>
+  <PropertyGroup>
+    <PostBuildEvent>del Contact Conversion Wizard.exe
+..\..\packages\ILRepack.2.0.18\tools\ILRepack.exe /out:"Contact Conversion Wizard.exe" Contact-Conversion-Wizard.exe Google.GData.Client.dll Google.GData.Contacts.dll Google.GData.Extensions.dll LumenWorks.Framework.IO.dll Newtonsoft.Json.dll</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/source/Form1.cs b/source/Form1.cs
@@ -3752,8 +3752,11 @@ private void save_data_GrandstreamGXV(string filename, System.Collections.Hashta
             // write file footer.
             resultSB.Append("</AddressBook>");
 
+            // Set Encoding to UTF-8 without BOM
+            System.Text.Encoding encoding = new System.Text.UTF8Encoding(false);
+
             // actually write the file to disk
-            System.IO.File.WriteAllText(filename, resultSB.ToString(), Encoding.GetEncoding("UTF-8"));
+            System.IO.File.WriteAllText(filename, resultSB.ToString(), encoding);
 
             // tell the user this has been done
             string errorwarning = "";
@@ -3771,7 +3774,7 @@ private void save_data_GrandstreamGXP(string filename, System.Collections.Hashta
             StringBuilder resultSB = new StringBuilder();
 
             // write the header
-            resultSB.Append("<?xml version=\"1.0\"?>\n<AddressBook>\n");
+            resultSB.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<AddressBook>\n");
 
             // initialize hashtable to store generated data results
             System.Collections.Hashtable MySaveDataHash = new System.Collections.Hashtable();
@@ -3833,8 +3836,11 @@ private void save_data_GrandstreamGXP(string filename, System.Collections.Hashta
             // write file footer.
             resultSB.Append("</AddressBook>\n");
 
+            // Set Encoding to UTF-8 without BOM
+            System.Text.Encoding encoding = new System.Text.UTF8Encoding(false);
+
             // actually write the file to disk
-            System.IO.File.WriteAllText(filename, resultSB.ToString(), Encoding.GetEncoding("ISO-8859-1"));
+            System.IO.File.WriteAllText(filename, resultSB.ToString(), encoding);
 
             // tell the user this has been done
             MessageBox.Show(MySaveDataHash.Count + " contacts written to " + filename + " !");

diff --git a/source/Properties/AssemblyInfo.cs b/source/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Contact Conversion Wizard")]
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,12 +25,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// 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("3.5.0.0")]
-[assembly: AssemblyFileVersion("3.5.0.0")]
+[assembly: AssemblyVersion("3.5.0.1")]
+[assembly: AssemblyFileVersion("3.5.0.1")]
diff --git a/source/packages.config b/source/packages.config
@@ -3,6 +3,7 @@
   <package id="Google.GData.Client" version="2.2.0.0" targetFramework="net40" />
   <package id="Google.GData.Contacts" version="2.2.0.0" targetFramework="net40" />
   <package id="Google.GData.Extensions" version="2.2.0.0" targetFramework="net40" />
+  <package id="ILRepack" version="2.0.18" targetFramework="net40" />
   <package id="Microsoft.Office.Interop.Outlook" version="15.0.4797.1003" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="4.0.5" targetFramework="net40" />
 </packages>