From 7fe1f883f8c7246142072e1e478499179b447e61 Mon Sep 17 00:00:00 2001 From: Hansel Date: Thu, 17 Mar 2016 11:56:47 -0400 Subject: [PATCH] Remove trayIcon on exit and changed build config. --- .gitignore | 236 --------------------- HyperionScreenCap.sln | 12 +- HyperionScreenCap/Form1.Designer.cs | 1 + HyperionScreenCap/HyperionScreenCap.csproj | 17 ++ 4 files changed, 24 insertions(+), 242 deletions(-) diff --git a/.gitignore b/.gitignore index 94420dc..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,236 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/HyperionScreenCap.sln b/HyperionScreenCap.sln index 7967ac9..b9e3831 100644 --- a/HyperionScreenCap.sln +++ b/HyperionScreenCap.sln @@ -7,14 +7,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HyperionScreenCap", "Hyperi EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Release|Any CPU.Build.0 = Release|Any CPU + {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Debug|x86.ActiveCfg = Debug|x86 + {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Debug|x86.Build.0 = Debug|x86 + {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Release|x86.ActiveCfg = Release|x86 + {9EC68860-AE7E-413F-A5A4-AC31B93912C2}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/HyperionScreenCap/Form1.Designer.cs b/HyperionScreenCap/Form1.Designer.cs index 14cd789..6a5f206 100644 --- a/HyperionScreenCap/Form1.Designer.cs +++ b/HyperionScreenCap/Form1.Designer.cs @@ -15,6 +15,7 @@ protected override void Dispose(bool disposing) { if (disposing && (components != null)) { + trayIcon.Dispose(); closeConnection(); components.Dispose(); } diff --git a/HyperionScreenCap/HyperionScreenCap.csproj b/HyperionScreenCap/HyperionScreenCap.csproj index b41859a..8eac030 100644 --- a/HyperionScreenCap/HyperionScreenCap.csproj +++ b/HyperionScreenCap/HyperionScreenCap.csproj @@ -35,6 +35,23 @@ + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + ..\packages\SlimDX.4.0.13.44\lib\NET40\SlimDX.dll