Linux builds and assembly attributes cleanup (#258)

* Move assembly parameters to Directory.Build.props, closes #257 * Fix GetAssemblyCodeBasePath() for Linux deployments, closes #250
sharparchitecture · Oct 25, 2021 · b90d11f · b90d11f
1 parent 6a67d03
commit b90d11f
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 75 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,10 +2,13 @@
   <PropertyGroup Label="Build">
     <Product>Sharp Architecture</Product>
     <Authors>Sharp Architecture Dev Team</Authors>
-
+    <Copyright>Copyright &#xA9; Sharp Architecture Development Team</Copyright>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+    <Culture></Culture>
     <SignAssembly>false</SignAssembly>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
@@ -59,6 +62,13 @@
     <NoWarn>$(NoWarn);0618;1591</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == false">
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>SharpArch.XunitTests</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+
   <PropertyGroup Condition="'$(MSBuildProjectFullPath.Contains(Sample))' == true">
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);1591</NoWarn>
@@ -73,4 +83,11 @@
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.InteropServices.ComVisibleAttribute">
+      <_Parameter1>false</_Parameter1>
+      <_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
+    </AssemblyAttribute>
+  </ItemGroup>
+
 </Project>
diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.Api/Suteki.TardisBank.Api.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.Api/Suteki.TardisBank.Api.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
-  <ItemGroup Label="Package References (.NET 5)" Condition=" '$(TargetFramework)' == 'net5' ">
+  <ItemGroup Label="Package References (.NET 5)" Condition=" '$(TargetFramework)' == 'net5.0' ">
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/Src/Common/CommonAssemblyInfo.cs b/Src/Common/CommonAssemblyInfo.cs
diff --git a/Src/SharpArch.Domain/Properties/AssemblyInfo.cs b/Src/SharpArch.Domain/Properties/AssemblyInfo.cs
diff --git a/Src/SharpArch.Domain/SharpArch.Domain.csproj b/Src/SharpArch.Domain/SharpArch.Domain.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.Infrastructure/CodeBaseLocator.cs b/Src/SharpArch.Infrastructure/CodeBaseLocator.cs
@@ -21,13 +21,16 @@ public class CodeBaseLocator
         public static string GetAssemblyCodeBasePath(Assembly assembly)
         {
             if (assembly == null) throw new ArgumentNullException(nameof(assembly));
+
 #if NET5_0_OR_GREATER
-            var uri = new UriBuilder(assembly.Location);
+            return Path.GetDirectoryName(assembly.Location)
+                ?? Directory.GetCurrentDirectory();
+
 #else
             var uri = new UriBuilder(assembly.CodeBase);
-#endif
             var uriPath = Uri.UnescapeDataString(uri.Path);
             return Path.GetDirectoryName(uriPath)!;
+#endif
         }
     }
 }
diff --git a/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj b/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <ItemGroup Label="NETStandard 2.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/...NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj b/...NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.NHibernate/EntityDuplicateChecker.cs b/Src/SharpArch.NHibernate/EntityDuplicateChecker.cs
@@ -18,7 +18,7 @@
     [PublicAPI]
     public class EntityDuplicateChecker : IEntityDuplicateChecker
     {
-        static readonly DateTime _uninitializedDatetime;
+        static readonly DateTime _uninitializedDatetime = default;
         readonly ISession _session;
 
         /// <summary>

diff --git a/Src/SharpArch.NHibernate/Properties/AssemblyInfo.cs b/Src/SharpArch.NHibernate/Properties/AssemblyInfo.cs
diff --git a/Src/SharpArch.NHibernate/SharpArch.NHibernate.csproj b/Src/SharpArch.NHibernate/SharpArch.NHibernate.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.RavenDb/Properties/AssemblyInfo.cs b/Src/SharpArch.RavenDb/Properties/AssemblyInfo.cs
diff --git a/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj b/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.Testing.NUnit/Properties/AssemblyInfo.cs b/Src/SharpArch.Testing.NUnit/Properties/AssemblyInfo.cs
diff --git a/Src/SharpArch.Testing.NUnit/SharpArch.Testing.NUnit.csproj b/Src/SharpArch.Testing.NUnit/SharpArch.Testing.NUnit.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
     <Compile Include="..\Common\NHibernate\TestDatabaseSetup.cs" Link="NHibernate\TestDatabaseSetup.cs" />
   </ItemGroup>
 

diff --git a/Src/SharpArch.Testing.Xunit.NHibernate/SharpArch.Testing.Xunit.NHibernate.csproj b/Src/SharpArch.Testing.Xunit.NHibernate/SharpArch.Testing.Xunit.NHibernate.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
     <Compile Include="..\Common\NHibernate\TestDatabaseSetup.cs" Link="TestDatabaseSetup.cs" />
   </ItemGroup>
 

diff --git a/Src/SharpArch.Testing.Xunit/SharpArch.Testing.Xunit.csproj b/Src/SharpArch.Testing.Xunit/SharpArch.Testing.Xunit.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.Testing/SharpArch.Testing.csproj b/Src/SharpArch.Testing/SharpArch.Testing.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Pack">

diff --git a/Src/SharpArch.Web.AspNetCore/SharpArch.Web.AspNetCore.csproj b/Src/SharpArch.Web.AspNetCore/SharpArch.Web.AspNetCore.csproj
@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <Compile Include="..\Common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
-    <Compile Include="..\Common\CommonAssemblyInfo.cs" Link="CommonAssemblyInfo.cs" />
   </ItemGroup>
 
   <PropertyGroup Label="Build">

diff --git a/Src/Tests/SharpArch.XunitTests/SharpArch.Infrastructure/CodeBaseLocatorTests.cs b/Src/Tests/SharpArch.XunitTests/SharpArch.Infrastructure/CodeBaseLocatorTests.cs
@@ -0,0 +1,30 @@
+namespace Tests.SharpArch.Infrastructure
+{
+    using System;
+    using System.IO;
+    using System.Reflection;
+    using FluentAssertions;
+    using global::SharpArch.Infrastructure;
+    using Xunit;
+    using Xunit.Abstractions;
+
+
+    public class CodeBaseLocatorTests
+    {
+        readonly ITestOutputHelper _output;
+
+        public CodeBaseLocatorTests(ITestOutputHelper output)
+        {
+            _output = output ?? throw new ArgumentNullException(nameof(output));
+        }
+
+        [Fact]
+        public void CanResolveAssemblyPath()
+        {
+            var path = CodeBaseLocator.GetAssemblyCodeBasePath(Assembly.GetExecutingAssembly());
+            _output.WriteLine("Assembly path: '{0}'", path);
+            path.Should().NotBeNullOrEmpty();
+            Directory.Exists(path).Should().BeTrue();
+        }
+    }
+}
diff --git a/Src/Tests/SharpArch.XunitTests/SharpArch.XunitTests.csproj b/Src/Tests/SharpArch.XunitTests/SharpArch.XunitTests.csproj
@@ -24,4 +24,8 @@
     <ProjectReference Include="..\..\SharpArch.Testing\SharpArch.Testing.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="SharpArch.Infrastructure\" />
+  </ItemGroup>
+
 </Project>