diff --git a/Xbim.Common/Xbim.Common.csproj b/Xbim.Common/Xbim.Common.csproj
index fa2d0d3ed..ae08f43ee 100644
--- a/Xbim.Common/Xbim.Common.csproj
+++ b/Xbim.Common/Xbim.Common.csproj
@@ -1,25 +1,29 @@
-
- net45;net46;net47;netstandard2.0;netstandard2.1;netcoreapp3.1
- Xbim Common
- Provides support for the Xbim commonly used behaviours and interfaces.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ net45;net46;net47;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0
+ Xbim Common
+ Provides support for the Xbim commonly used behaviours and interfaces.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Xbim.Common/XbimAssemblyInfo.cs b/Xbim.Common/XbimAssemblyInfo.cs
index 36405f6d1..d423cb240 100644
--- a/Xbim.Common/XbimAssemblyInfo.cs
+++ b/Xbim.Common/XbimAssemblyInfo.cs
@@ -67,9 +67,15 @@ public string FileVersion
public FileInfo FileInfo
{
+#if NET6_0
+ get => _assembly.IsDynamic ?
+ new FileInfo("") :
+ new FileInfo(new Uri(_assembly.Location).LocalPath);
+#else
get => _assembly.IsDynamic ?
new FileInfo("") :
new FileInfo(new Uri(_assembly.CodeBase).LocalPath);
+#endif
}
///
diff --git a/Xbim.Essentials.NetCore.Tests/Xbim.Essentials.NetCore.Tests.csproj b/Xbim.Essentials.NetCore.Tests/Xbim.Essentials.NetCore.Tests.csproj
index 08515fe7a..0236d9b7e 100644
--- a/Xbim.Essentials.NetCore.Tests/Xbim.Essentials.NetCore.Tests.csproj
+++ b/Xbim.Essentials.NetCore.Tests/Xbim.Essentials.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net6.0
false
@@ -9,9 +9,9 @@
-
-
-
+
+
+