From 2ee438bfdb808c6aba70db6d907ef3bd7345319c Mon Sep 17 00:00:00 2001 From: Stephen Wade Date: Thu, 20 Jul 2017 22:06:53 -0400 Subject: [PATCH] normalize the line endings --- .gitattributes | 21 + CHANGELOG.md | 7 - NetSparkle/NetSparkle.csproj | 618 +++++++++--------- NetSparkleChecker/NetSparkleChecker.csproj | 314 ++++----- .../NetSparkleDSAHelper.csproj | 156 ++--- NetSparkleTestApp/NetSparkleTestApp.csproj | 212 +++--- .../NetSparkleTestAppWPF.csproj | 264 ++++---- SampleApplication/SampleApplication.csproj | 252 +++---- 8 files changed, 929 insertions(+), 915 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..94f98265 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,21 @@ +# Automatically normalize line endings in the working directory +* text=auto + +# Use CRLF in working directory on all platforms for Visual Studio project files +*.sln text eol=crlf +*.csproj text eol=crlf +*.vbproj text eol=crlf +*.vcxproj text eol=crlf +*.vcproj text eol=crlf +*.dbproj text eol=crlf +*.fsproj text eol=crlf +*.lsproj text eol=crlf +*.wixproj text eol=crlf +*.modelproj text eol=crlf +*.sqlproj text eol=crlf +*.wmaproj text eol=crlf + +*.xproj text eol=crlf +*.props text eol=crlf +*.filters text eol=crlf +*.vcxitems text eol=crlf diff --git a/CHANGELOG.md b/CHANGELOG.md index c22c1dfb..2d346a3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,20 +2,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - ### Added ### Changed - - Moved `UpdateStatus` enum to `NetSparkle.Enums` - Moved `UpdateInfo` class to its own file ### Removed ## [0.11.0] - 2017-07-16 - ### Added - - Refactored logic to quit application to a separate `QuitApplication()` function ### Changed @@ -23,8 +19,6 @@ All notable changes to this project will be documented in this file. - Renamed some files and variables - Moved `SecurityMode` and `ValidationResult` enums to the `NetSparkle.Enums` namespace -### Removed - ## [0.10.0] - 2017-07-11 ### Added - This changelog @@ -32,7 +26,6 @@ All notable changes to this project will be documented in this file. - Section about how the appcast works to the readme ### Changed - Much thanks to @stephenwade for his contributions to 0.10.0 - Cleaned up and added documentation comments throughout the code (@stephenwade) diff --git a/NetSparkle/NetSparkle.csproj b/NetSparkle/NetSparkle.csproj index 2480d4b5..f5f2bc6d 100644 --- a/NetSparkle/NetSparkle.csproj +++ b/NetSparkle/NetSparkle.csproj @@ -1,316 +1,316 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {74635A21-2BAD-4522-AB95-E3E5703CD301} - Library - Properties - NetSparkle - NetSparkle - v4.5.1 - 512 - - - 3.5 - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - - - - - - - true - full - false - ..\bin\Debug\NetSparkle\ - DEBUG;TRACE - prompt - 4 - true - Debug\lib\net40-full\NetSparkle.Net40.xml - MinimumRecommendedRules.ruleset - false - - - pdbonly - true - ..\bin\Release\NetSparkle\ - TRACE - prompt - 4 - false - - - true - ..\bin\Debug\ - DEBUG;TRACE - ..\bin\Debug\NetSparkle.XML - false - full - AnyCPU - ..\bin\Debug\lib\net40-full\NetSparkle.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false - false - - - ..\bin\Release\ - TRACE - true - pdbonly - AnyCPU - ..\bin\Release\lib\net40-full\NetSparkle.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - ..\bin\Release\NetSparkle.xml - false - - - false - - - - - - - - - - - 3.5 - - - - - - 3.5 - - - 3.5 - - - - - - - - Properties\AssemblyInfo.cs - - - Form - - - CheckingForUpdatesWindow.cs - - - - - - - - - - - - Form - - - MessageNotificationWindow.cs - - - - - - - - - - - - Form - - - DownloadProgressWindow.cs - - - - - Form - - - UpdateAvailableWindow.cs - - - - - Form - - - ToastNotifier.cs - - - True - True - Resources.resx - - - - - - - CheckingForUpdatesWindow.cs - - - MessageNotificationWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - DownloadProgressWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - UpdateAvailableWindow.cs - - - ToastNotifier.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {74635A21-2BAD-4522-AB95-E3E5703CD301} + Library + Properties + NetSparkle + NetSparkle + v4.5.1 + 512 + + + 3.5 + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + + + + + + + + true + full + false + ..\bin\Debug\NetSparkle\ + DEBUG;TRACE + prompt + 4 + true + Debug\lib\net40-full\NetSparkle.Net40.xml + MinimumRecommendedRules.ruleset + false + + + pdbonly + true + ..\bin\Release\NetSparkle\ + TRACE + prompt + 4 + false + + + true + ..\bin\Debug\ + DEBUG;TRACE + ..\bin\Debug\NetSparkle.XML + false + full + AnyCPU + ..\bin\Debug\lib\net40-full\NetSparkle.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + false + false + + + ..\bin\Release\ + TRACE + true + pdbonly + AnyCPU + ..\bin\Release\lib\net40-full\NetSparkle.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + ..\bin\Release\NetSparkle.xml + false + + + false + + + + + + + + + + + 3.5 + + + + + + 3.5 + + + 3.5 + + + + + + + + Properties\AssemblyInfo.cs + + + Form + + + CheckingForUpdatesWindow.cs + + + + + + + + + + + + Form + + + MessageNotificationWindow.cs + + + + + + + + + + + + Form + + + DownloadProgressWindow.cs + + + + + Form + + + UpdateAvailableWindow.cs + + + + + Form + + + ToastNotifier.cs + + + True + True + Resources.resx + + + + + + + CheckingForUpdatesWindow.cs + + + MessageNotificationWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + DownloadProgressWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + UpdateAvailableWindow.cs + + + ToastNotifier.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + + --> \ No newline at end of file diff --git a/NetSparkleChecker/NetSparkleChecker.csproj b/NetSparkleChecker/NetSparkleChecker.csproj index a07b48a9..e903aa82 100644 --- a/NetSparkleChecker/NetSparkleChecker.csproj +++ b/NetSparkleChecker/NetSparkleChecker.csproj @@ -1,158 +1,158 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {C5EB5203-0E15-49AC-8CD0-719DA6756188} - WinExe - Properties - NetSparkleChecker - NetSparkleChecker - v4.5.2 - 512 - - - 3.5 - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - - - - - - - true - full - false - ..\bin\Debug\NetSparkleChecker\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\bin\Release\NetSparkleChecker\ - TRACE - prompt - 4 - false - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - - - - Properties\AssemblyInfo.cs - - - Form - - - NetSparkleCheckerWaitUI.cs - - - - Form - - - SoftwareUpToDate.cs - - - NetSparkleCheckerWaitUI.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SoftwareUpToDate.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - {74635A21-2BAD-4522-AB95-E3E5703CD301} - NetSparkle - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {C5EB5203-0E15-49AC-8CD0-719DA6756188} + WinExe + Properties + NetSparkleChecker + NetSparkleChecker + v4.5.2 + 512 + + + 3.5 + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + + + + + + + + true + full + false + ..\bin\Debug\NetSparkleChecker\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\bin\Release\NetSparkleChecker\ + TRACE + prompt + 4 + false + + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + Properties\AssemblyInfo.cs + + + Form + + + NetSparkleCheckerWaitUI.cs + + + + Form + + + SoftwareUpToDate.cs + + + NetSparkleCheckerWaitUI.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + SoftwareUpToDate.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + {74635A21-2BAD-4522-AB95-E3E5703CD301} + NetSparkle + + + + \ No newline at end of file diff --git a/NetSparkleDSAHelper/NetSparkleDSAHelper.csproj b/NetSparkleDSAHelper/NetSparkleDSAHelper.csproj index ce57256d..9a3aa296 100644 --- a/NetSparkleDSAHelper/NetSparkleDSAHelper.csproj +++ b/NetSparkleDSAHelper/NetSparkleDSAHelper.csproj @@ -1,79 +1,79 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {B4D6FCB0-1217-4AFA-A2A5-4BA5482876C0} - Exe - Properties - NetSparkle.DSAHelper - NetSparkle.DSAHelper - v4.5.2 - - - 512 - - - - - - - - - - - AnyCPU - true - full - false - ..\bin\Debug\DSAHelper\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - ..\bin\Release\DSAHelper\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - Properties\AssemblyInfo.cs - - - - - - {74635A21-2BAD-4522-AB95-E3E5703CD301} - NetSparkle - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {B4D6FCB0-1217-4AFA-A2A5-4BA5482876C0} + Exe + Properties + NetSparkle.DSAHelper + NetSparkle.DSAHelper + v4.5.2 + + + 512 + + + + + + + + + + + AnyCPU + true + full + false + ..\bin\Debug\DSAHelper\ + DEBUG;TRACE + prompt + 4 + false + + + AnyCPU + pdbonly + true + ..\bin\Release\DSAHelper\ + TRACE + prompt + 4 + false + + + + + + + + + + + + + Properties\AssemblyInfo.cs + + + + + + {74635A21-2BAD-4522-AB95-E3E5703CD301} + NetSparkle + + + + + + + \ No newline at end of file diff --git a/NetSparkleTestApp/NetSparkleTestApp.csproj b/NetSparkleTestApp/NetSparkleTestApp.csproj index 9631c2f8..a30d0327 100644 --- a/NetSparkleTestApp/NetSparkleTestApp.csproj +++ b/NetSparkleTestApp/NetSparkleTestApp.csproj @@ -1,107 +1,107 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {5D5F4532-9CA6-4380-818D-A8FAC21450D1} - WinExe - Properties - NetSparkle.TestApp - NetSparkle.TestApp - v4.5.2 - - - 512 - - - - - - - - - - - AnyCPU - true - full - false - ..\bin\Debug\TestApp\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - ..\bin\Release\TestApp\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {74635A21-2BAD-4522-AB95-E3E5703CD301} - NetSparkle - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {5D5F4532-9CA6-4380-818D-A8FAC21450D1} + WinExe + Properties + NetSparkle.TestApp + NetSparkle.TestApp + v4.5.2 + + + 512 + + + + + + + + + + + AnyCPU + true + full + false + ..\bin\Debug\TestApp\ + DEBUG;TRACE + prompt + 4 + false + + + AnyCPU + pdbonly + true + ..\bin\Release\TestApp\ + TRACE + prompt + 4 + false + + + + + + + + + + + + + + + + Form + + + Form1.cs + + + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + {74635A21-2BAD-4522-AB95-E3E5703CD301} + NetSparkle + + + + \ No newline at end of file diff --git a/NetSparkleTestAppWPF/NetSparkleTestAppWPF.csproj b/NetSparkleTestAppWPF/NetSparkleTestAppWPF.csproj index 08b8acec..7ca9d457 100644 --- a/NetSparkleTestAppWPF/NetSparkleTestAppWPF.csproj +++ b/NetSparkleTestAppWPF/NetSparkleTestAppWPF.csproj @@ -1,133 +1,133 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {BBE308BB-4096-4E7B-A458-85172F47C497} - WinExe - Properties - NetSparkle.TestAppWPF - NetSparkle.TestAppWPF - v4.5.2 - - - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - - - - - - - - x86 - true - full - false - ..\bin\Debug\TestAppWPF\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - ..\bin\Release\TestAppWPF\ - TRACE - prompt - 4 - false - - - - - - software-update-available.ico - - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - {74635A21-2BAD-4522-AB95-E3E5703CD301} - NetSparkle - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {BBE308BB-4096-4E7B-A458-85172F47C497} + WinExe + Properties + NetSparkle.TestAppWPF + NetSparkle.TestAppWPF + v4.5.2 + + + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + + + + + + + + + x86 + true + full + false + ..\bin\Debug\TestAppWPF\ + DEBUG;TRACE + prompt + 4 + false + + + x86 + pdbonly + true + ..\bin\Release\TestAppWPF\ + TRACE + prompt + 4 + false + + + + + + software-update-available.ico + + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {74635A21-2BAD-4522-AB95-E3E5703CD301} + NetSparkle + + + + + + + \ No newline at end of file diff --git a/SampleApplication/SampleApplication.csproj b/SampleApplication/SampleApplication.csproj index 92e504f8..6b6b6d35 100644 --- a/SampleApplication/SampleApplication.csproj +++ b/SampleApplication/SampleApplication.csproj @@ -1,133 +1,133 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {B85E1883-AD3C-4EEF-B947-7B743ECCE0F0} - WinExe - Properties - SampleApplication - SampleApplication - v4.5.2 - - - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - x86 - true - full - false - ..\bin\Debug\SampleApplication\ - DEBUG;TRACE - prompt - 4 - MinimumRecommendedRules.ruleset - false - - - x86 - pdbonly - true - ..\bin\Release\SampleApplication\ - TRACE - prompt - 4 - false - - - software-update-available.ico - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {74635A21-2BAD-4522-AB95-E3E5703CD301} - NetSparkle - - - - - False - Microsoft .NET Framework 4.5.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {B85E1883-AD3C-4EEF-B947-7B743ECCE0F0} + WinExe + Properties + SampleApplication + SampleApplication + v4.5.2 + + + 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + x86 + true + full + false + ..\bin\Debug\SampleApplication\ + DEBUG;TRACE + prompt + 4 + MinimumRecommendedRules.ruleset + false + + + x86 + pdbonly + true + ..\bin\Release\SampleApplication\ + TRACE + prompt + 4 + false + + + software-update-available.ico + + + + + + + + + + + + + + + + Form + + + Form1.cs + + + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + {74635A21-2BAD-4522-AB95-E3E5703CD301} + NetSparkle + + + + + False + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + --> \ No newline at end of file