diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..d935f308b7e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto eol=crlf
+*.sh eol=lf
diff --git a/.gitignore b/.gitignore
index bcb0019b29f..017f4da7c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ target/
 *.sln.ide
 *.cache
 *.sln.metaproj
-.gitattributes
 .settings
 log.txt
 debugSettings.json
diff --git a/build.ps1 b/build.ps1
index b03875efded..c99e5f799bb 100644
--- a/build.ps1
+++ b/build.ps1
@@ -136,7 +136,7 @@ if ($prod -eq $true) {
     $assemblyVersion = (($version + '0') -join '.').Substring(1)
     $assemblyFileVersion = (($version + $revision) -join '.').Substring(1)
     if ($branch -ne $releaseBranch) {
-        $abbrev = $commitInfo[2]
+        $abbrev = $commitInfo[2].Substring(0, 7)
         $packageVersion = ((($version -join '.'), "b", $revision, $abbrev) -join '-').Substring(1)
     }
     else {