diff --git a/.gitattributes b/.gitattributes
index 367c088539db..b5845d1480b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,5 @@
 * text=auto eol=lf working-tree-encoding=UTF-8
 
 # Bash scripts
-*.sh text eol=lf
+*.sh  text eol=lf
+*.cmd text eol=crlf
diff --git a/dotnet/build.cmd b/dotnet/build.cmd
index ec6b122ef487..ba30c180d8ae 100644
--- a/dotnet/build.cmd
+++ b/dotnet/build.cmd
@@ -1,5 +1,5 @@
 @echo off
-
-dotnet build --configuration Release --interactive
-
-dotnet test --configuration Release --no-build --no-restore --interactive
+setlocal
+cd "%~dp0"
+dotnet build --configuration Release --interactive ^
+  && dotnet test --configuration Release --no-build --no-restore --interactive