Version assembly with GitInfo too

devlooped · Jul 27, 2018 · 62f3e38 · 62f3e38
1 parent d1a7e47
commit 62f3e38
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 84 deletions.
diff --git a/build/AppVeyor.proj b/build/AppVeyor.proj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets/1.0.39">
 
-	<Import Project="$(BuildDirectory)GitInfo.props" />
+	<Import Project="$(BuildDirectory)GitVersion.props" />
 
 	<PropertyGroup>
 		<TargetFramework>netstandard1.0</TargetFramework>

diff --git a/build/AssemblyInfo.props b/build/AssemblyInfo.props
@@ -0,0 +1,10 @@
+<Project>
+
+	<PropertyGroup>
+		<GenerateAssemblyInfo Condition="'$(GenerateAssemblyInfo)' == ''">True</GenerateAssemblyInfo>
+		<AssemblyTitle Condition="'$(AssemblyTitle)' == ''">$(MSBuildProjectName)</AssemblyTitle>
+		<Product Condition="'$(Product)' == ''">Moq</Product>
+		<Company Condition="'$(Company)' == ''">Clarius Consulting, Manas Technology Solutions, InSTEDD</Company>
+	</PropertyGroup>
+
+</Project>
diff --git a/build/GitInfo.props b/build/GitInfo.props
diff --git a/build/GitVersion.props b/build/GitVersion.props
@@ -0,0 +1,30 @@
+<Project>
+
+	<PropertyGroup>
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+		<GitIgnoreTagVersion>True</GitIgnoreTagVersion>
+		<GitIgnoreBranchVersion>True</GitIgnoreBranchVersion>
+		<GitThisAssembly>False</GitThisAssembly>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="GitInfo" Version="2.0.11" PrivateAssets="All" />
+	</ItemGroup>
+
+	<Target Name="SetAssemblyInfoVersions" AfterTargets="PrepareForBuild" BeforeTargets="GenerateAssemblyInfo" DependsOnTargets="GitVersion">
+		<PropertyGroup>
+			<AssemblyVersion Condition="'$(AssemblyVersion)' == ''">$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion>
+			<FileVersion Condition="'$(FileVersion)' == ''">$(GitBaseVersion).$(GitCommits)</FileVersion>
+			<InformationalVersion Condition="'$(InformationalVersion)' == '' And '$(GitCommits)' == '0'">$(GitBaseVersion)$(GitSemVerDashLabel)-$(GitBranch)+sha.$(GitCommit)</InformationalVersion>
+			<InformationalVersion Condition="'$(InformationalVersion)' == '' And '$(GitCommits)' != '0'">$(GitBaseVersion).$(GitCommits)$(GitSemVerDashLabel)-$(GitBranch)+sha.$(GitCommit)</InformationalVersion>
+		</PropertyGroup>
+	</Target>
+
+	<Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GitVersion">
+		<PropertyGroup>
+			<PackageVersion>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)</PackageVersion>
+			<NuspecProperties>configuration=$(Configuration);version=$(PackageVersion)</NuspecProperties>
+		</PropertyGroup>
+	</Target>
+
+</Project>
diff --git a/src/Moq/Moq.csproj b/src/Moq/Moq.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<Import Project="$(BuildDirectory)GitInfo.props" />
+	<Import Project="$(BuildDirectory)AssemblyInfo.props" />
+	<Import Project="$(BuildDirectory)GitVersion.props" />
 	<Import Project="$(BuildDirectory)SignAssembly.props" />
 	<Import Project="$(BuildDirectory)SourceLink.props" />
 
@@ -10,7 +11,6 @@
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>full</DebugType>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> 
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateDocumentation>true</GenerateDocumentation>
 		<NoWarn>0419</NoWarn>
 		<RootNamespace>Moq</RootNamespace>
@@ -150,13 +150,6 @@
 		</None>
 	</ItemGroup>
 
-	<Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GitVersion">
-		<PropertyGroup>
-			<PackageVersion>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)</PackageVersion>
-			<NuspecProperties>configuration=$(Configuration);version=$(PackageVersion)</NuspecProperties>
-		</PropertyGroup>
-	</Target>
-
 	<Target Name="Test" />
 
 </Project>
diff --git a/src/Moq/Properties/AssemblyInfo.cs b/src/Moq/Properties/AssemblyInfo.cs
@@ -4,36 +4,10 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Moq")]
-[assembly: AssemblyCompany("Clarius Consulting, Manas Technology Solutions, InSTEDD")]
-[assembly: AssemblyProduct("Moq")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion(ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + ".0.0")]
-[assembly: AssemblyFileVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch)]
-[assembly: AssemblyInformationalVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch + "-" + ThisAssembly.Git.Branch + "+" + ThisAssembly.Git.Commit)]
-
 [assembly: ComVisible(false)]
 
-#if DEBUG
-[assembly: AssemblyConfiguration ("DEBUG")]
-#endif
-#if RELEASE
-[assembly: AssemblyConfiguration ("RELEASE")]
-#endif
-
 [assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
 [assembly: CLSCompliant(true)]
 [assembly: NeutralResourcesLanguage("en-US")]
-
-/// <group name="overview" title="Overview" order="0" />
-/// <group name="setups" title="Specifying setups" order="1" />
-/// <group name="returns" title="Returning values from members" order="2" />
-/// <group name="verification" title="Verifying setups" order="3" />
-/// <group name="advanced" title="Advanced scenarios" order="99" />
-/// <group name="factory" title="Using MockFactory for consistency across mocks" order="4" />
-internal static partial class ThisAssembly
-{
-}
diff --git a/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj b/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+	<Import Project="$(BuildDirectory)AssemblyInfo.props" />
 	<Import Project="$(BuildDirectory)SignAssembly.props" />
 	<Import Project="$(BuildDirectory)xUnit.props" />
 

diff --git a/tests/Moq.Tests/Moq.Tests.csproj b/tests/Moq.Tests/Moq.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+	<Import Project="$(BuildDirectory)AssemblyInfo.props" />
 	<Import Project="$(BuildDirectory)SignAssembly.props" />
 	<Import Project="$(BuildDirectory)xUnit.props" />
 

diff --git a/tests/Moq.Tests/Properties/AssemblyInfo.cs b/tests/Moq.Tests/Properties/AssemblyInfo.cs