diff --git a/.editorconfig b/.editorconfig
index c9361a7..e324fbd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,4 +3,12 @@
 dotnet_diagnostic.CS4014.severity = error
 
 # CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
-dotnet_diagnostic.CS1591.severity = none
\ No newline at end of file
+dotnet_diagnostic.CS1591.severity = silent
+
+# C# styling
+csharp_style_namespace_declarations=file_scoped:error
+
+[*.{targets,csproj}]
+tab_width=2
+indent_style=space
+indent_size=2
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 5c19f2d..84da7d5 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       run: dotnet restore
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
index 2c59894..7c694f1 100644
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -18,10 +18,10 @@ jobs:
     - uses: actions/checkout@v2
     # We do not need to fetch tags, as we're already at a tagged build - it should be available automatically
 
-    - name: Setup .NET Core 5.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Pack
       run: dotnet pack -c Release -o Build
diff --git a/.gitignore b/.gitignore
index 21bb375..1d03b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .vs/
+.idea/
 bin/
 obj/
 Build/
diff --git a/Directory.Build.props b/Directory.Build.props
index ed7e654..4a51ee1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -44,6 +44,12 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
+  <!-- Set copying files etc. to timeout faster -->
+  <PropertyGroup>
+    <CopyRetryCount>2</CopyRetryCount>
+    <CopyRetryDelayMilliseconds>500</CopyRetryDelayMilliseconds>
+  </PropertyGroup>
+
   <!-- Ensure AssemblyInfo.cs can be included in <EmbedUntrackedSources> https://github.com/dotnet/sourcelink/issues/572 -->
   <Target Name="_workaroundMsBuild1479" BeforeTargets="BeforeCompile" AfterTargets="GenerateAssemblyInfo"></Target>