diff --git a/.editorconfig b/.editorconfig
index 64ebee9..aa29dbd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,14 +1,26 @@
 [*]
-charset=utf-8
-end_of_line=lf
-trim_trailing_whitespace=false
-insert_final_newline=false
-indent_style=space
-indent_size=4
+charset = utf-8
+end_of_line = lf
+indent_style = space
+max_line_length = 180
+insert_final_newline = true
 
 [*.cs]
-max_line_length = 160
+indent_size = 4
+insert_final_newline = true
+
+[*.csproj]
+indent_size = 2
 
 [{*.yml,*.yaml}]
-indent_style=space
-indent_size=2
\ No newline at end of file
+indent_size = 2
+
+[*.json]
+indent_size = 2
+
+[{*.sh, *.ps1}]
+indent_size = 2
+
+# code style settings:
+[*.{cs}]
+dotnet_sort_system_directives_first = true
diff --git a/.gitattributes b/.gitattributes
index 412eeda..be48d62 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,18 +5,3 @@
 *.cs     diff=csharp
 *.sln    merge=union
 *.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
diff --git a/Prometheus.Client.HttpRequestDurations.sln b/Prometheus.Client.HttpRequestDurations.sln
index 5039b11..d40373f 100644
--- a/Prometheus.Client.HttpRequestDurations.sln
+++ b/Prometheus.Client.HttpRequestDurations.sln
@@ -13,16 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 		appveyor.yml = appveyor.yml
 		.editorconfig = .editorconfig
+		pack.ps1 = pack.ps1
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.HttpRequestDurations", "src\Prometheus.Client.HttpRequestDurations\Prometheus.Client.HttpRequestDurations.csproj", "{C0984EB8-6DB2-4FA7-85E3-7BD1417EF31F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{852492CB-7359-4A9F-B769-9CF468B4B9A5}"
-ProjectSection(SolutionItems) = preProject
-	pack.ps1 = pack.ps1
-	build.ps1 = build.ps1
-EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,7 +34,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C0984EB8-6DB2-4FA7-85E3-7BD1417EF31F} = {B922FA4B-1584-4EA7-8656-F9034FB45F9D}
-		{852492CB-7359-4A9F-B769-9CF468B4B9A5} = {285A8931-C09A-482E-9EF3-D90AA616A0FD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {122FC3C2-0B76-492D-98B6-0E610316031E}
diff --git a/appveyor.yml b/appveyor.yml
index de5a8a8..8b47c60 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,10 +6,10 @@ skip_commits:
     - '**/*.md'
 
 build_script:
-- ps: .\build.ps1
+- pwsh: dotnet build -c Release
 
 after_build:
-- ps: .\pack.ps1
+- pwsh: .\pack.ps1
 
 artifacts:
 - path: '**\artifacts\nuget\*.nupkg'
@@ -32,4 +32,4 @@ deploy:
   artifact: MyGet
   on:
     branch: master
-    appveyor_repo_tag: false
\ No newline at end of file
+    appveyor_repo_tag: false
diff --git a/build.ps1 b/build.ps1
deleted file mode 100644
index 2811bc9..0000000
--- a/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-dotnet restore
-dotnet build src\Prometheus.Client.HttpRequestDurations -c Release
\ No newline at end of file
diff --git a/pack.ps1 b/pack.ps1
index bccd9b8..3f07b14 100644
--- a/pack.ps1
+++ b/pack.ps1
@@ -1,7 +1,7 @@
 if ($env:APPVEYOR_REPO_TAG -eq "false") {
-    dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build --version-suffix build$env:APPVEYOR_BUILD_NUMBER -o artifacts\myget
+  dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build --version-suffix build$env:APPVEYOR_BUILD_NUMBER -o artifacts\myget
 }
 
 if ($env:APPVEYOR_REPO_TAG -eq "true") {
-    dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build -o artifacts\nuget
-}
\ No newline at end of file
+  dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build -o artifacts\nuget
+}