Merge pull request #1 from danilwhale/rewrite

rewrite

.gitignore

@@ -1,24 +1,10 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
-=======
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> c6d355b (0.0.3-prealpha)
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-=======
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
->>>>>>> 009817d (0.0.3-prealpha)
-<<<<<<< HEAD
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
+## Get latest from `dotnet new gitignore`
+
+# dotenv files
+.env
 
 # User-specific files
 *.rsuser
@@ -40,22 +26,7 @@ mono_crash.*
 [Rr]eleases/
 x64/
 x86/
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-[Ww][Ii][Nn]32/
->>>>>>> 009817d (0.0.3-prealpha)
-=======
-<<<<<<< HEAD
-[Ww][Ii][Nn]32/
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
-=======
 [Ww][Ii][Nn]32/
->>>>>>> 009817d (0.0.3-prealpha)
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
@@ -89,31 +60,17 @@ dlldata.c
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 
-# .NET Core
+# .NET
 project.lock.json
 project.fragment.lock.json
 artifacts/
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
+# Tye
+.tye/
 
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> c6d355b (0.0.3-prealpha)
-=======
 # ASP.NET Scaffolding
 ScaffoldingReadMe.txt
 
->>>>>>> 009817d (0.0.3-prealpha)
-<<<<<<< HEAD
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # StyleCop
 StyleCopReport.xml
 
@@ -139,22 +96,7 @@ StyleCopReport.xml
 *.tmp_proj
 *_wpftmp.csproj
 *.log
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-*.tlog
->>>>>>> 009817d (0.0.3-prealpha)
-=======
-<<<<<<< HEAD
 *.tlog
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
-=======
-*.tlog
->>>>>>> 009817d (0.0.3-prealpha)
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 *.vspscc
 *.vssscc
 .builds
@@ -206,30 +148,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # Coverlet is a free, cross platform Code Coverage Tool
 coverage*.json
 coverage*.xml
 coverage*.info
 
-<<<<<<< HEAD
->>>>>>> 009817d (0.0.3-prealpha)
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> 009817d (0.0.3-prealpha)
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -377,15 +300,6 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # Visual Studio 6 auto-generated project file (contains which files were open etc.)
 *.vbp
 
@@ -397,16 +311,6 @@ node_modules/
 *.ncb
 *.aps
 
-<<<<<<< HEAD
->>>>>>> 009817d (0.0.3-prealpha)
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> 009817d (0.0.3-prealpha)
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -463,26 +367,9 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-# Visual Studio History (VSHistory) files
-.vshistory/
-
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> c6d355b (0.0.3-prealpha)
-=======
 # Visual Studio History (VSHistory) files
 .vshistory/
 
->>>>>>> 009817d (0.0.3-prealpha)
-<<<<<<< HEAD
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 # BeatPulse healthcheck temp database
 healthchecksdb
 
@@ -491,15 +378,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
@@ -524,13 +402,83 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-<<<<<<< HEAD
->>>>>>> 009817d (0.0.3-prealpha)
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 1523d8c (Initial commit)
-=======
->>>>>>> 009817d (0.0.3-prealpha)
->>>>>>> 415de6f (0.0.3-prealpha)
->>>>>>> c6d355b (0.0.3-prealpha)
+.idea
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# Vim temporary swap files
+*.swp