diff --git a/HostsFileEditor.proj b/HostsFileEditor.proj index 2cf7030..f811096 100644 --- a/HostsFileEditor.proj +++ b/HostsFileEditor.proj @@ -23,26 +23,18 @@ with HostsFileEditor. If not, see http://www.gnu.org/licenses/. Release - Any CPU + netcoreapp3.1 + win-x86 + Include=".\src\**\bin\**\$(Configuration)\**\publish\**\*.*" + Exclude="*.pdb"> - - - @@ -59,7 +51,7 @@ with HostsFileEditor. If not, see http://www.gnu.org/licenses/. + Include=".\src\**\bin\**\*.*;.\setup\**\bin\**\*.*"> @@ -77,13 +69,19 @@ with HostsFileEditor. If not, see http://www.gnu.org/licenses/. + Include=".\src\*.csproj"> + + + + ItemName="HostsFileEditorSetup"/> - + + diff --git a/HostsFileEditor.sln b/HostsFileEditor.sln index d60023c..1759325 100644 --- a/HostsFileEditor.sln +++ b/HostsFileEditor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30128.74 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostsFileEditor", "src\HostsFileEditor.csproj", "{17A37069-B2AC-4D58-8F6E-C955F284F94C}" EndProject @@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{BF6F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment", "{51E2000C-3F31-4E18-8A74-02CDEEBEC6A4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGenCustomAction", "setup\NGenInstallCustomAction\NGenCustomAction.csproj", "{BD2FA119-BB09-4F09-A646-338CD73F9491}" -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "HostsFileEditorSetup", "setup\HostsFileEditorSetup.wixproj", "{A78A7EC4-2707-408C-A19F-AB237F0D85BA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{28C2637D-F3C9-4040-B7B4-A7C7AAA898CC}" @@ -60,18 +58,6 @@ Global {17A37069-B2AC-4D58-8F6E-C955F284F94C}.Release|Mixed Platforms.Build.0 = Release|Any CPU {17A37069-B2AC-4D58-8F6E-C955F284F94C}.Release|x86.ActiveCfg = Release|Any CPU {17A37069-B2AC-4D58-8F6E-C955F284F94C}.Release|x86.Build.0 = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Debug|x86.Build.0 = Debug|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|Any CPU.Build.0 = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|x86.ActiveCfg = Release|Any CPU - {BD2FA119-BB09-4F09-A646-338CD73F9491}.Release|x86.Build.0 = Release|Any CPU {A78A7EC4-2707-408C-A19F-AB237F0D85BA}.Debug|Any CPU.ActiveCfg = Debug|x86 {A78A7EC4-2707-408C-A19F-AB237F0D85BA}.Debug|Any CPU.Build.0 = Debug|x86 {A78A7EC4-2707-408C-A19F-AB237F0D85BA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 @@ -90,7 +76,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {17A37069-B2AC-4D58-8F6E-C955F284F94C} = {F4971D95-21F4-4E91-B8EE-3971F0B50FE3} - {BD2FA119-BB09-4F09-A646-338CD73F9491} = {51E2000C-3F31-4E18-8A74-02CDEEBEC6A4} {A78A7EC4-2707-408C-A19F-AB237F0D85BA} = {51E2000C-3F31-4E18-8A74-02CDEEBEC6A4} {28C2637D-F3C9-4040-B7B4-A7C7AAA898CC} = {51E2000C-3F31-4E18-8A74-02CDEEBEC6A4} {90653B84-9F43-4140-AACC-6F9970696669} = {28C2637D-F3C9-4040-B7B4-A7C7AAA898CC} diff --git a/Readme.md b/Readme.md index 2d59a4f..e251c7f 100644 --- a/Readme.md +++ b/Readme.md @@ -1,8 +1,8 @@ ## Download Release binaries can be downloaded from [GitHub](https://github.com/scottlerch/HostsFileEditor/releases) or [CodePlex](https://hostsfileeditor.codeplex.com/). - * [Download Latest Installer](https://github.com/scottlerch/HostsFileEditor/releases/download/v1.2.0/HostsFileEditorSetup-1.2.0.msi) - * [Download Latest Portable](https://github.com/scottlerch/HostsFileEditor/releases/download/v1.2.0/HostsFileEditor-1.2.0.zip) + * [Download Latest Installer](https://github.com/scottlerch/HostsFileEditor/releases/download/v1.3.0/HostsFileEditorSetup-1.3.0.msi) + * [Download Latest Portable](https://github.com/scottlerch/HostsFileEditor/releases/download/v1.3.0/HostsFileEditor-1.3.0.zip) ## Features * Cut, copy, paste, duplicate, enable, disable and move one or more entries at a time @@ -27,7 +27,7 @@ Using the filter and sort while editing is quirky. The filter and sort are appli ## Build -Requires Visual Studio 2017 or newer. To build the installer you must have WiX Toolset 3.7+. +Requires Visual Studio 2019 or newer. To build the installer you must have WiX Toolset 3.7+. Run `build-release.bat` or `build-debug.bat`. diff --git a/build-clean.bat b/build-clean.bat index adc3685..a939c81 100644 --- a/build-clean.bat +++ b/build-clean.bat @@ -4,4 +4,8 @@ if exist logs goto msbuild mkdir logs :msbuild -"%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Clean \ No newline at end of file +"%PROGRAMFILES(X86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath > vspath.txt +set /p VSPath= < vspath.txt +del vspath.txt + +"%VSPath%\MSBuild\Current\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Clean \ No newline at end of file diff --git a/build-debug.bat b/build-debug.bat index bc734d9..6f29cd6 100644 --- a/build-debug.bat +++ b/build-debug.bat @@ -4,4 +4,8 @@ if exist logs goto msbuild mkdir logs :msbuild -"%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Debug /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-debug.log \ No newline at end of file +"%PROGRAMFILES(X86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath > vspath.txt +set /p VSPath= < vspath.txt +del vspath.txt + +"%VSPath%\MSBuild\Current\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Debug /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-debug.log \ No newline at end of file diff --git a/build-release-signed.bat b/build-release-signed.bat index f723308..87b1afa 100644 --- a/build-release-signed.bat +++ b/build-release-signed.bat @@ -5,7 +5,11 @@ if exist logs goto msbuild mkdir logs :msbuild -"%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Release /p:StrongName=true /p:Sign=true /p:CertPassword=%1 /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-release.log +"%PROGRAMFILES(X86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath > vspath.txt +set /p VSPath= < vspath.txt +del vspath.txt + +"%VSPath%\MSBuild\Current\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Release /p:StrongName=true /p:Sign=true /p:CertPassword=%1 /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-release.log goto end :passwordblank diff --git a/build-release.bat b/build-release.bat index 488a752..b508ee1 100644 --- a/build-release.bat +++ b/build-release.bat @@ -4,7 +4,11 @@ if exist logs goto msbuild mkdir logs :msbuild -"%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Release /p:StrongName=true /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-release.log +"%PROGRAMFILES(X86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath > vspath.txt +set /p VSPath= < vspath.txt +del vspath.txt + +"%VSPath%\MSBuild\Current\Bin\MSBUILD.exe" HostsFileEditor.proj /t:Build /p:Configuration=Release /p:StrongName=true /l:FileLogger,Microsoft.Build.Engine;logfile=logs\build-release.log goto end :end \ No newline at end of file diff --git a/choco/hosts.editor.nuspec b/choco/hosts.editor.nuspec index d9d2728..0cee15f 100644 --- a/choco/hosts.editor.nuspec +++ b/choco/hosts.editor.nuspec @@ -2,7 +2,7 @@ hosts.editor - 1.2.0 + 1.3.0 Hosts File Editor scottlerch scottlerch,stimpy77 diff --git a/choco/tools/chocolateyInstall.ps1 b/choco/tools/chocolateyInstall.ps1 index 6dfe829..70328eb 100644 --- a/choco/tools/chocolateyInstall.ps1 +++ b/choco/tools/chocolateyInstall.ps1 @@ -1,6 +1,6 @@ $packageName = 'hosts.editor' $installerType = 'msi' -$url = 'https://github.com/scottlerch/HostsFileEditor/releases/download/v1.2.0/HostsFileEditorSetup-1.2.0.msi' +$url = 'https://github.com/scottlerch/HostsFileEditor/releases/download/v1.3.0/HostsFileEditorSetup-1.3.0.msi' $silentArgs = '/quiet' $validExitCodes = @(0) diff --git a/lib/Microsoft.WindowsAPICodePack.Shell.dll b/lib/Microsoft.WindowsAPICodePack.Shell.dll deleted file mode 100644 index 4542663..0000000 Binary files a/lib/Microsoft.WindowsAPICodePack.Shell.dll and /dev/null differ diff --git a/lib/Microsoft.WindowsAPICodePack.ShellExtensions.dll b/lib/Microsoft.WindowsAPICodePack.ShellExtensions.dll deleted file mode 100644 index 190b321..0000000 Binary files a/lib/Microsoft.WindowsAPICodePack.ShellExtensions.dll and /dev/null differ diff --git a/lib/Microsoft.WindowsAPICodePack.dll b/lib/Microsoft.WindowsAPICodePack.dll deleted file mode 100644 index ac86949..0000000 Binary files a/lib/Microsoft.WindowsAPICodePack.dll and /dev/null differ diff --git a/setup/HostsFileEditorSetup.wixproj b/setup/HostsFileEditorSetup.wixproj index 4ee45cd..bde9826 100644 --- a/setup/HostsFileEditorSetup.wixproj +++ b/setup/HostsFileEditorSetup.wixproj @@ -10,6 +10,7 @@ Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + false bin\$(Configuration)\ @@ -27,30 +28,11 @@ - - - HostsFileEditor - {17a37069-b2ac-4d58-8f6e-c955f284f94c} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - NGenCustomAction - {bd2fa119-bb09-4f09-a646-338cd73f9491} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - diff --git a/setup/NGenInstallCustomAction/NGenCustomAction.cs b/setup/NGenInstallCustomAction/NGenCustomAction.cs deleted file mode 100644 index e3b69d0..0000000 --- a/setup/NGenInstallCustomAction/NGenCustomAction.cs +++ /dev/null @@ -1,173 +0,0 @@ -// -// Copyright 2011 Scott M. Lerch -// -// This file is part of HostsFileEditor. -// -// HostsFileEditor is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 2 of the License, or (at your option) -// any later version. -// -// HostsFileEditor is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along -// with HostsFileEditor. If not, see http://www.gnu.org/licenses/. -// - -namespace NGenInstallCustomAction -{ - using System; - using System.Collections; - using System.Configuration.Install; - using System.Diagnostics; - using System.IO; - using System.Security.Permissions; - - /// - /// Custom install action to run NGen. - /// Source: http://msdn.microsoft.com/en-us/library/3hwzzhyd.aspx - /// - public class NGenCustomAction : Installer - { - /// - /// Installs the specified saved state. - /// - /// State of the saved. - [SecurityPermission(SecurityAction.Demand)] - public override void Install(IDictionary savedState) - { - base.Install(savedState); - this.Context.LogMessage(">>>> ngenCA: install"); - this.ngenCA(savedState, "install"); - } - - /// - /// When overridden in a derived class, completes the install transaction. - /// - /// An - /// that contains the state of the computer after all the installers in the - /// collection have run. - /// The - /// parameter is null.-or- The saved-state - /// might have been corrupted. - /// - /// An - /// exception occurred during the - /// - /// phase of the installation. This exception is ignored and the - /// installation continues. However, the application might not function - /// correctly after the installation is complete. - [SecurityPermission(SecurityAction.Demand)] - public override void Commit(IDictionary savedState) - { - base.Commit(savedState); - this.Context.LogMessage(">>>> ngenCA: commit"); - } - - /// - /// When overridden in a derived class, removes an installation. - /// - /// An - /// that contains the state of the computer after the installation was complete. - /// The saved-state - /// might have been - /// corrupted. - /// - /// An exception occurred while uninstalling. This exception is ignored - /// and the uninstall continues. However, the application might not be - /// fully uninstalled after the uninstallation completes. - [SecurityPermission(SecurityAction.Demand)] - public override void Uninstall(IDictionary savedState) - { - base.Uninstall(savedState); - this.Context.LogMessage(">>>> ngenCA: uninstall"); - this.ngenCA(savedState, "uninstall"); - } - - /// - /// When overridden in a derived class, restores the pre-installation - /// state of the computer. - /// - /// An - /// that contains the pre-installation state of the computer. - /// The - /// parameter is null.-or- The saved-state - /// might have been - /// corrupted. - /// - /// An exception occurred during the - /// - /// phase of the installation. This exception is ignored and the rollback - /// continues. However, the computer might not be fully reverted to its - /// initial state after the rollback completes. - [SecurityPermission(SecurityAction.Demand)] - public override void Rollback(IDictionary savedState) - { - base.Rollback(savedState); - this.Context.LogMessage(">>>> ngenCA: rollback"); - this.ngenCA(savedState, "uninstall"); - } - - /// - /// Perfrom NGen. - /// - /// State of the saved. - /// The ngen command. - [SecurityPermission(SecurityAction.Demand)] - private void ngenCA(IDictionary savedState, string ngenCommand) - { - string[] argsArray; - - if (string.Compare(ngenCommand, "install", StringComparison.OrdinalIgnoreCase) == 0) - { - string args = Context.Parameters["Args"]; - if (string.IsNullOrEmpty(args)) - { - throw new InstallException("No arguments specified"); - } - - char[] separators = { ';' }; - argsArray = args.Split(separators); - - // It is Ok to 'ngen uninstall' assemblies which were not installed - savedState.Add("NgenCAArgs", argsArray); - } - else - { - argsArray = (string[])savedState["NgenCAArgs"]; - } - - // Gets the path to the Framework directory. - string frameworkPath = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory(); - - for (int i = 0; i < argsArray.Length; ++i) - { - string arg = argsArray[i]; - - // Quotes the argument, in case it has a space in it. - arg = "\"" + arg + "\""; - - string command = ngenCommand + " " + arg; - - ProcessStartInfo si = new ProcessStartInfo(Path.Combine(frameworkPath, "ngen.exe"), command); - si.WindowStyle = ProcessWindowStyle.Hidden; - - Process p; - - try - { - Context.LogMessage(">>>>" + Path.Combine(frameworkPath, "ngen.exe ") + command); - p = Process.Start(si); - p.WaitForExit(); - } - catch (Exception ex) - { - throw new InstallException("Failed to ngen " + arg, ex); - } - } - } - } -} diff --git a/setup/NGenInstallCustomAction/NGenCustomAction.csproj b/setup/NGenInstallCustomAction/NGenCustomAction.csproj deleted file mode 100644 index 6ad1bbe..0000000 --- a/setup/NGenInstallCustomAction/NGenCustomAction.csproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {BD2FA119-BB09-4F09-A646-338CD73F9491} - Library - Properties - NGenInstallCustomAction - NGenInstallCustomAction - v4.0 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - true - MinimumRecommendedRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - true - MinimumRecommendedRules.ruleset - - - - - - - - - - Component - - - - - - \ No newline at end of file diff --git a/setup/NGenInstallCustomAction/Properties/AssemblyInfo.cs b/setup/NGenInstallCustomAction/Properties/AssemblyInfo.cs deleted file mode 100644 index 247b566..0000000 --- a/setup/NGenInstallCustomAction/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -// -// Copyright 2011 Scott M. Lerch -// -// This file is part of HostsFileEditor. -// -// HostsFileEditor is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 2 of the License, or (at your option) -// any later version. -// -// HostsFileEditor is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along -// with HostsFileEditor. If not, see http://www.gnu.org/licenses/. -// - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("NGenInstallCustomAction")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NGenInstallCustomAction")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[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 -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("299b6f34-bf0c-4389-9bfe-5984121aa1c7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/setup/Product.wxs b/setup/Product.wxs index 21105f8..58cdc6c 100644 --- a/setup/Product.wxs +++ b/setup/Product.wxs @@ -1,16 +1,13 @@ - + - - - @@ -35,14 +32,11 @@ - + - - - - + @@ -52,7 +46,6 @@ - @@ -711,15 +704,13 @@ - + NEWERPRODUCTFOUND AND NOT Installed NOT Installed TARGETDIR="" - $C__2D8E9D5E0281E1A725F43A79C55FED20>2 - $C__2D8E9D5E0281E1A725F43A79C55FED20>2 NOT Installed diff --git a/setup/Resources/Binary/InstallUtil b/setup/Resources/Binary/InstallUtil deleted file mode 100644 index f2f4ff2..0000000 Binary files a/setup/Resources/Binary/InstallUtil and /dev/null differ diff --git a/src/HostsFileEditor.csproj b/src/HostsFileEditor.csproj index 9a1af90..c7ecbc2 100644 --- a/src/HostsFileEditor.csproj +++ b/src/HostsFileEditor.csproj @@ -1,237 +1,37 @@ - - - + + - Debug - x86 - 8.0.30703 - 2.0 - {17A37069-B2AC-4D58-8F6E-C955F284F94C} WinExe - Properties - HostsFileEditor - HostsFileEditor - v4.0 - Client - 512 - - - - - HostsFileEditor.Program - - + netcoreapp3.1 + win-x86 + true + true + true + true + 1.3.0.0 + 1.3.0.0 + en-US + Hosts File Editor + Hosts File Editor + Copyright © Scott Lerch 2020 + Hosts File Editor makes it easy to change your hosts file as well as archive multiple versions for easy retrieval. It also includes features to ping IP addresses and enable/disable your hosts file altogether. + N/A HostsFileEditor.ico - - - app.manifest + ..\bin - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - bin\Debug\HostsFileEditor.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - false - false - true - true - true - - - bin\Release\ - TRACE - true - pdbonly - AnyCPU - bin\Release\HostsFileEditor.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - false - false - true - true - - - false - - - - - + - - ..\lib\Equin.ApplicationFramework.BindingListView.dll - - - - - - - - - - - - Form - - - AboutForm.cs - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - - Component - - - Component - - - - - Form - - - InputForm.cs - - - Form - - - MainForm.cs - - - - - - - - - - - - AboutForm.cs - - - InputForm.cs - - - MainForm.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs + + PreserveNewest + true - - True - Settings.settings - True - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ..\lib\Equin.ApplicationFramework.BindingListView.dll + - - - - - - - - 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}. - - - - - - - - - - + \ No newline at end of file diff --git a/src/app.config b/src/HostsFileEditor.exe.config similarity index 94% rename from src/app.config rename to src/HostsFileEditor.exe.config index 382de43..a2cd59f 100644 --- a/src/app.config +++ b/src/HostsFileEditor.exe.config @@ -25,9 +25,6 @@ with HostsFileEditor. If not, see http://www.gnu.org/licenses/.
- - - diff --git a/src/ILMerge.props b/src/ILMerge.props deleted file mode 100644 index 436f933..0000000 --- a/src/ILMerge.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - true - - - - - - - - - - - - ScottLerch.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ILMergeOrder.txt b/src/ILMergeOrder.txt deleted file mode 100644 index 3fda7f5..0000000 --- a/src/ILMergeOrder.txt +++ /dev/null @@ -1,4 +0,0 @@ -# this file contains the partial list of the merged assemblies in the merge order -# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build -# and finetune merge order to your satisfaction - diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 1fabc85..8fe5098 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -17,42 +17,7 @@ // with HostsFileEditor. If not, see http://www.gnu.org/licenses/. // -using System.Reflection; -using System.Resources; using System.Runtime.InteropServices; -// 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("Hosts File Editor")] -[assembly: AssemblyDescription( - "Hosts File Editor makes it easy to change your hosts file as well as " + - "archive multiple versions for easy retrieval. It also includes " + - "features to ping IP addresses and enable/disable your hosts file " + - "altogether.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("N/A")] -[assembly: AssemblyProduct("Hosts File Editor")] -[assembly: AssemblyCopyright("Copyright © Scott Lerch 2011")] -[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 -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b4b3456c-23e3-4db0-ae55-99dc847f7096")] - -// Version information for an assembly consists of the following four values: -// Major Version -// Minor Version -// Build Number -// Revision -// 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("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] -[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file +[assembly: Guid("b4b3456c-23e3-4db0-ae55-99dc847f7096")] \ No newline at end of file diff --git a/src/packages.config b/src/packages.config deleted file mode 100644 index f6699b8..0000000 --- a/src/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file