Merge remote-tracking branch 'origin/master' into az/integrate-pretti…

…er-with-eslint

.github/workflows/ci-js.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled]
     branches: [master]
+    paths-ignore:
+      - 'net/**'
+      - 'Sails.Net.sln'
   push:
     branches: [master]
     paths:

.github/workflows/ci.yml

@@ -3,7 +3,13 @@ name: CI (Rust)
 on:
   push:
     branches: [master]
+    paths-ignore:
+      - 'net/**'
+      - 'Sails.Net.sln'
   pull_request:
+    paths-ignore:
+      - 'net/**'
+      - 'Sails.Net.sln'
 
 env:
   BINARYEN_VERSION: version_111

.gitignore

@@ -1,10 +1,16 @@
 .binpath
 .DS_Store
+.vs
 .vscode
 *.log
 
+# Rust
 target/
 
+# C#
+net/**/[Bb]in/
+net/**/[Oo]bj/
+
 # js
 node_modules/
 js/**/lib/

Sails.Net.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sails.Net", "net\src\Sails.Net\Sails.Net.csproj", "{92AA0FB6-FBEB-4AB1-9541-034C3A267B5E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{92AA0FB6-FBEB-4AB1-9541-034C3A267B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92AA0FB6-FBEB-4AB1-9541-034C3A267B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92AA0FB6-FBEB-4AB1-9541-034C3A267B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92AA0FB6-FBEB-4AB1-9541-034C3A267B5E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0894C08B-8BB9-401D-8471-26F5EB5A4EA2}
+	EndGlobalSection
+EndGlobal