From ea430642e753f179a950564521f6b9efb2089794 Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Fri, 11 Mar 2016 10:16:33 -0800 Subject: [PATCH 1/5] Use standard GitHub .gitignore for VS projects --- .gitignore | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c0f92b0..4f21f62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,245 @@ -bin/ -obj/ +## 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/ +[Ll]og/ + +# 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/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# 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 + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# 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 +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml \ No newline at end of file From 4408a33ef673643400b49cda11365edee84a259b Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Fri, 11 Mar 2016 10:23:00 -0800 Subject: [PATCH 2/5] Don't track .user files in git --- ViewEnvironment/ViewEnvironment.vbproj.user | 31 --------------------- 1 file changed, 31 deletions(-) delete mode 100644 ViewEnvironment/ViewEnvironment.vbproj.user diff --git a/ViewEnvironment/ViewEnvironment.vbproj.user b/ViewEnvironment/ViewEnvironment.vbproj.user deleted file mode 100644 index b5191b4..0000000 --- a/ViewEnvironment/ViewEnvironment.vbproj.user +++ /dev/null @@ -1,31 +0,0 @@ - - - - ProjectFiles - - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - - \ No newline at end of file From d62c85e61a014b454819f677b252e04fccb2ae51 Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Fri, 11 Mar 2016 10:23:23 -0800 Subject: [PATCH 3/5] Resaved project file using VS 2015 - This allows the project to be opened in VS 2015 without showing changes in git --- ViewEnvironment/ViewEnvironment.vbproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ViewEnvironment/ViewEnvironment.vbproj b/ViewEnvironment/ViewEnvironment.vbproj index 1c1142a..7a267a1 100644 --- a/ViewEnvironment/ViewEnvironment.vbproj +++ b/ViewEnvironment/ViewEnvironment.vbproj @@ -1,4 +1,4 @@ - + @@ -20,6 +20,7 @@ + true @@ -115,7 +116,9 @@ - + + Designer + @@ -169,4 +172,4 @@ --> - + \ No newline at end of file From dee06f24aff926d2cf827405acafafc7ad0438b6 Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Fri, 11 Mar 2016 10:30:00 -0800 Subject: [PATCH 4/5] Change project file from VB to C# --- ViewEnvironment.sln | 2 +- .../{ViewEnvironment.vbproj => ViewEnvironment.csproj} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename ViewEnvironment/{ViewEnvironment.vbproj => ViewEnvironment.csproj} (99%) diff --git a/ViewEnvironment.sln b/ViewEnvironment.sln index 8f5feeb..bb48406 100644 --- a/ViewEnvironment.sln +++ b/ViewEnvironment.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ViewEnvironment", "ViewEnvironment\ViewEnvironment.vbproj", "{B29B307C-710A-4ABA-820C-89F943105CE2}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ViewEnvironment", "ViewEnvironment\ViewEnvironment.csproj", "{B29B307C-710A-4ABA-820C-89F943105CE2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ViewEnvironment/ViewEnvironment.vbproj b/ViewEnvironment/ViewEnvironment.csproj similarity index 99% rename from ViewEnvironment/ViewEnvironment.vbproj rename to ViewEnvironment/ViewEnvironment.csproj index 7a267a1..4cfdd9d 100644 --- a/ViewEnvironment/ViewEnvironment.vbproj +++ b/ViewEnvironment/ViewEnvironment.csproj @@ -144,7 +144,7 @@ On - + From 1e9e144dd5a59ccf65ea4df6980c407e4a17637b Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Fri, 11 Mar 2016 10:34:28 -0800 Subject: [PATCH 5/5] Don't generate assembly XML documentation file --- ViewEnvironment/ViewEnvironment.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ViewEnvironment/ViewEnvironment.csproj b/ViewEnvironment/ViewEnvironment.csproj index 4cfdd9d..e65b110 100644 --- a/ViewEnvironment/ViewEnvironment.csproj +++ b/ViewEnvironment/ViewEnvironment.csproj @@ -28,7 +28,8 @@ true true bin\ - ViewEnvironment.xml + + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -37,7 +38,8 @@ true true bin\ - ViewEnvironment.xml + + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022