diff --git a/.gitignore b/.gitignore index 8c8878b9..55aa13a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1,45 @@ +_build/ +_site/ +Properties/ + +# Use git add -f to force override .sln when required. Not needed in most cases. +# git add -f myProj.sln +*.sln + +Project_Readme.html + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. -Detection.cs -DetectionPenaltyResult.cs -Thresholds.cs - # User-specific files *.suo *.user +*.userosscache *.sln.docstates +*.vscode/ +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs # Build results [Dd]ebug/ [Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ x64/ +x86/ build/ bld/ [Bb]in/ [Oo]bj/ -# Roslyn cache directories -*.ide/ +# Visual Studo 2015 cache/options directory +.vs/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -#NUNIT +# NUNIT *.VisualState.xml TestResult.xml @@ -127,22 +139,19 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -## TODO: Comment the next line if you want to checkin your -## web deploy settings but do note that will include unencrypted -## passwords -#*.pubxml +# 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 Directory -packages/* -## TODO: If the tool you use requires repositories.config -## uncomment the next line -#!packages/repositories.config - -# Enable "build/" folder in the NuGet Packages folder since -# NuGet packages use it for MSBuild targets. -# This line needs to be after the ignore of the build folder -# (and the packages folder if the line above has been uncommented) -!packages/build/ +# 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 # Windows Azure Build Output csx/ @@ -152,8 +161,7 @@ csx/ AppPackages/ # Others -sql/ -*.Cache +*.[Cc]ache ClientBin/ [Ss]tyle[Cc]op.* ~$* @@ -163,6 +171,7 @@ ClientBin/ *.pfx *.publishsettings node_modules/ +bower_components/ # RIA/Silverlight projects Generated_Code/ @@ -187,19 +196,25 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ -# LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml -/.vs/IW4M Admin/v15 -/.vs/IW4M Admin/v15/Browse.VC.db -/.vs/IW4M Admin/v15 -/DEPLOY -/DEPLOY -*.bat -/DEPLOY/clean_for_publish.bat -/.vs/IW4MAdmin/v15 -/.vs/IW4MAdmin/v15 -/.vs/IW4MAdmin/v15 -/.vs/IW4MAdmin/v15/Browse.VC.db -**/wwwroot/lib \ No newline at end of file +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +project.lock.json +**/wwwroot/lib/ +**/wwwroot/lib/ +**/wwwroot/lib/* +__pycache__/ + +#Mac OSX +.DS_Store + +# Windows thumbnail cache files +Thumbs.db + +DEPLOY \ No newline at end of file diff --git a/WebfrontCore/IW4MAdmin.ico b/WebfrontCore/IW4MAdmin.ico new file mode 100644 index 00000000..d32b2042 Binary files /dev/null and b/WebfrontCore/IW4MAdmin.ico differ diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 1f9267d2..0c587cb5 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -1,7 +1,8 @@ - + netcoreapp2.0 + win-x64;linux-x64 2.6 RaidMax.IW4MAdmin.WebfrontCore 2.0.0 @@ -22,6 +23,10 @@ + + + +