Merge branch 'master' into develop

Conflicts: ChinookDatabase.Test/DatabaseTests/DatabaseFixture.tt ChinookDatabase/DataSources/ChinookDatabase.txt ChinookDatabase/DataSources/Chinook_PostgreSql.sql ChinookDatabase/DataSources/CreatePostgreSql.bat ChinookDatabase/DataSources/Package.bat NuGet/ChinookDatabase.SqlScripts/ChinookDatabase.SqlScripts.1.4.0.nuspec
lerocha · Feb 10, 2024 · 753fd40 · 753fd40
2 parents adfd7ea + 5156927
commit 753fd40
Show file tree

Hide file tree

Showing 105 changed files with 148,916 additions and 255,116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@ _ReSharper.*
 *.nupkg
 .DS_Store
 .idea/
+.vs/
+EnvDTE.dll
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/ChinookDatabase.Test/App.config b/ChinookDatabase.Test/App.config
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,5 @@ _ReSharper.* @@
     *.nupkg
     .DS_Store
     .idea/
+    .vs/
+    EnvDTE.dll