Merge pull request #87 from tibel/update-deps

BenMorris · web-flow · commit 624d45a34347 · 2021-05-16T13:56:21.000+01:00
Update dependencies
diff --git a/src/NetArchTest.Rules/Extensions/TypeExtensions.cs b/src/NetArchTest.Rules/Extensions/TypeExtensions.cs
@@ -21,9 +21,7 @@ public static TypeDefinition ToTypeDefinition(this Type type)
             var assembly = Assembly.GetAssembly(type);
 
             // Load the assembly into the Mono.Cecil library
-            UriBuilder uri = new UriBuilder(assembly.CodeBase);
-            string path = Uri.UnescapeDataString(uri.Path);
-            var assemblyDef = AssemblyDefinition.ReadAssembly(path);
+            var assemblyDef = AssemblyDefinition.ReadAssembly(assembly.Location);
 
             // Find the matching type
             var dependencies = (assemblyDef.Modules
diff --git a/src/NetArchTest.Rules/NetArchTest.Rules.csproj b/src/NetArchTest.Rules/NetArchTest.Rules.csproj
@@ -13,24 +13,17 @@
     <RepositoryUrl>https://github.com/BenMorris/NetArchTest</RepositoryUrl>
     <PackageTags>test architecture dependencies archtest</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>NetArchTest.Rules.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>NetArchTest.Rules.xml</DocumentationFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.3" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="bm-nuget-icon.png" Pack="true" PackagePath=""  />
+    <None Include="bm-nuget-icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NetArchTest.Rules/Types.cs b/src/NetArchTest.Rules/Types.cs
@@ -83,8 +83,7 @@ public static Types InAssemblies(IEnumerable<Assembly> assemblies, IEnumerable<s
                 if (!assembly.IsDynamic)
                 {
                     // Load the assembly using Mono.Cecil.
-                    UriBuilder uri = new UriBuilder(assembly.CodeBase);
-                    string path = Uri.UnescapeDataString(uri.Path);
+
 
                     AssemblyDefinition assemblyDef = null;
                     if (searchDirectories?.Any() ?? false)
@@ -95,11 +94,11 @@ public static Types InAssemblies(IEnumerable<Assembly> assemblies, IEnumerable<s
                             defaultAssemblyResolver.AddSearchDirectory(searchDirectory);
                         }
 
-                        assemblyDef = ReadAssemblyDefinition(path, new ReaderParameters { AssemblyResolver = defaultAssemblyResolver });
+                        assemblyDef = ReadAssemblyDefinition(assembly.Location, new ReaderParameters { AssemblyResolver = defaultAssemblyResolver });
                     }
                     else
                     { 
-                        assemblyDef = ReadAssemblyDefinition(path);
+                        assemblyDef = ReadAssemblyDefinition(assembly.Location);
                     }
 
                     // Read all the types in the assembly 
@@ -134,9 +133,7 @@ public static Types InNamespace(string name)
                 if (!assembly.IsDynamic)
                 {
                     // Load the assembly using Mono.Cecil.
-                    UriBuilder uri = new UriBuilder(assembly.CodeBase);
-                    string path = Uri.UnescapeDataString(uri.Path);
-                    var assemblyDef = ReadAssemblyDefinition(path);
+                    var assemblyDef = ReadAssemblyDefinition(assembly.Location);
 
                     if (assemblyDef != null)
                     {
diff --git a/test/NetArchTest.Rules.UnitTests/NetArchTest.Rules.UnitTests.csproj b/test/NetArchTest.Rules.UnitTests/NetArchTest.Rules.UnitTests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ public static Types InAssemblies(IEnumerable<Assembly> assemblies, IEnumerable<s`
`83`	`83`	`if (!assembly.IsDynamic)`
`84`	`84`	`{`
`85`	`85`	`// Load the assembly using Mono.Cecil.`
`86`		`- UriBuilder uri = new UriBuilder(assembly.CodeBase);`
`87`		`- string path = Uri.UnescapeDataString(uri.Path);`
	`86`	`+`
`88`	`87`
`89`	`88`	`AssemblyDefinition assemblyDef = null;`
`90`	`89`	`if (searchDirectories?.Any() ?? false)`
`@@ -95,11 +94,11 @@ public static Types InAssemblies(IEnumerable<Assembly> assemblies, IEnumerable<s`
`95`	`94`	`defaultAssemblyResolver.AddSearchDirectory(searchDirectory);`
`96`	`95`	`}`
`97`	`96`
`98`		`- assemblyDef = ReadAssemblyDefinition(path, new ReaderParameters { AssemblyResolver = defaultAssemblyResolver });`
	`97`	`+ assemblyDef = ReadAssemblyDefinition(assembly.Location, new ReaderParameters { AssemblyResolver = defaultAssemblyResolver });`
`99`	`98`	`}`
`100`	`99`	`else`
`101`	`100`	`{`
`102`		`- assemblyDef = ReadAssemblyDefinition(path);`
	`101`	`+ assemblyDef = ReadAssemblyDefinition(assembly.Location);`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`// Read all the types in the assembly`
`@@ -134,9 +133,7 @@ public static Types InNamespace(string name)`
`134`	`133`	`if (!assembly.IsDynamic)`
`135`	`134`	`{`
`136`	`135`	`// Load the assembly using Mono.Cecil.`
`137`		`- UriBuilder uri = new UriBuilder(assembly.CodeBase);`
`138`		`- string path = Uri.UnescapeDataString(uri.Path);`
`139`		`- var assemblyDef = ReadAssemblyDefinition(path);`
	`136`	`+ var assemblyDef = ReadAssemblyDefinition(assembly.Location);`
`140`	`137`
`141`	`138`	`if (assemblyDef != null)`
`142`	`139`	`{`