Merge pull request #22 from messerli-informatik-ag/gardening

tautropfli · web-flow · commit 436e12fd76a6 · 2021-10-25T15:49:10.000+02:00
Gardening
diff --git a/.editorconfig b/.editorconfig
@@ -8,9 +8,6 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[.gitmodules]
-indent_style = tab
-
 [*.{props,sln,targets}]
 indent_style = tab
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,6 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore -property:AutofacVersion=${{matrix.autofac}}
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore /p:TreatWarningsAsErrors=true
     - name: Run Tests
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build
diff --git a/CompositionRoot.Test/CompositionRoot.Test.csproj b/CompositionRoot.Test/CompositionRoot.Test.csproj
@@ -6,12 +6,9 @@
     </PropertyGroup>
     <PropertyGroup>
         <IsPackable>false</IsPackable>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <LangVersion>8.0</LangVersion>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9.0</LangVersion>
         <Nullable>enable</Nullable>
-        <NullableContextOptions>enable</NullableContextOptions>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\CompositionRoot\CompositionRoot.csproj" />
diff --git a/CompositionRoot.Test/Stubs/Bar.cs b/CompositionRoot.Test/Stubs/Bar.cs
@@ -1,5 +1,3 @@
-using Messerli.CompositionRoot.Test.Stubs;
-
 namespace Messerli.CompositionRoot.Test.Stubs
 {
     internal sealed class Bar : IBar
diff --git a/CompositionRoot.Test/Stubs/BarModule.cs b/CompositionRoot.Test/Stubs/BarModule.cs
@@ -1,5 +1,4 @@
 using Autofac;
-using Messerli.CompositionRoot.Test.Stubs;
 
 namespace Messerli.CompositionRoot.Test.Stubs
 {
diff --git a/CompositionRoot/CompositionRoot.csproj b/CompositionRoot/CompositionRoot.csproj
@@ -7,10 +7,8 @@
     </PropertyGroup>
     <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>9.0</LangVersion>
         <Nullable>enable</Nullable>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
     <PropertyGroup>
         <PackageId>Messerli.CompositionRoot</PackageId>
diff --git a/CompositionRoot/CompositionRootBuilder.cs b/CompositionRoot/CompositionRootBuilder.cs
@@ -5,7 +5,7 @@ namespace Messerli.CompositionRoot
 {
     public sealed class CompositionRootBuilder
     {
-        private readonly ContainerBuilder _builder = new ContainerBuilder();
+        private readonly ContainerBuilder _builder = new();
 
         public CompositionRootBuilder RegisterModule<T>()
             where T : IModule, new()
diff --git a/CompositionRoot/ModuleBuilder.cs b/CompositionRoot/ModuleBuilder.cs
@@ -38,7 +38,6 @@ public ModuleBuilder Register(Register registrationFunction)
         public IModule Build()
             => new ModuleRegistrar(_registrations);
 
-        private static ModuleBuilder ShallowClone(ImmutableList<Register> registrations)
-            => new ModuleBuilder(registrations);
+        private static ModuleBuilder ShallowClone(ImmutableList<Register> registrations) => new(registrations);
     }
 }
diff --git a/Packages.props b/Packages.props
@@ -6,7 +6,7 @@
 		<PackageReference Update="System.Collections.Immutable" Version="1.6" />
 	</ItemGroup>
 	<ItemGroup Label="Build Dependencies">
-		<PackageReference Update="Messerli.CodeStyle" Version="[1.2.1, 2)" />
+		<PackageReference Update="Messerli.CodeStyle" Version="2.1.1" />
 	</ItemGroup>
 	<ItemGroup Label="Test Dependencies">
 		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="[15.9.2, 16)" />
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
     "sdk": {
-        "version": "3.1.402",
-        "rollForward": "latestPatch"
+        "version": "5.0.402",
+        "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
-        "Microsoft.Build.CentralPackageVersions": "2.0.52"
+        "Microsoft.Build.CentralPackageVersions": "2.0.79"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using Messerli.CompositionRoot.Test.Stubs;`
`2`		`-`
`3`	`1`	`namespace Messerli.CompositionRoot.Test.Stubs`
`4`	`2`	`{`
`5`	`3`	`internal sealed class Bar : IBar`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Autofac;`
`2`		`-using Messerli.CompositionRoot.Test.Stubs;`
`3`	`2`
`4`	`3`	`namespace Messerli.CompositionRoot.Test.Stubs`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Messerli.CompositionRoot`
`5`	`5`	`{`
`6`	`6`	`public sealed class CompositionRootBuilder`
`7`	`7`	`{`
`8`		`- private readonly ContainerBuilder _builder = new ContainerBuilder();`
	`8`	`+ private readonly ContainerBuilder _builder = new();`
`9`	`9`
`10`	`10`	`public CompositionRootBuilder RegisterModule<T>()`
`11`	`11`	`where T : IModule, new()`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public ModuleBuilder Register(Register registrationFunction)`
`38`	`38`	`public IModule Build()`
`39`	`39`	`=> new ModuleRegistrar(_registrations);`
`40`	`40`
`41`		`- private static ModuleBuilder ShallowClone(ImmutableList<Register> registrations)`
`42`		`- => new ModuleBuilder(registrations);`
	`41`	`+ private static ModuleBuilder ShallowClone(ImmutableList<Register> registrations) => new(registrations);`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.1.402",`
`4`		`- "rollForward": "latestPatch"`
	`3`	`+ "version": "5.0.402",`
	`4`	`+ "rollForward": "latestFeature"`
`5`	`5`	`},`
`6`	`6`	`"msbuild-sdks": {`
`7`		`- "Microsoft.Build.CentralPackageVersions": "2.0.52"`
	`7`	`+ "Microsoft.Build.CentralPackageVersions": "2.0.79"`
`8`	`8`	`}`
`9`	`9`	`}`