Skip to content

Fix assembly version is not set #2143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arturcic merged 2 commits into from
Feb 27, 2020
Merged

Fix assembly version is not set #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eb77c8
GH-2101 - (build) set assembly version on build
arturcic Feb 27, 2020
31bc492
GH-2101 - (build) add assertion that the version is set correctly
arturcic Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build/pack.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ Task("Build")
RunGitVersionOnCI(parameters);
});

Task("Validate-Version")
.IsDependentOn("Build")
.Does<BuildParameters>((parameters) =>
{
ValidateVersion(parameters);
});

#endregion

#region Pack
Task("Pack-Prepare")
.IsDependentOn("Build")
.IsDependentOn("Validate-Version")
.Does<BuildParameters>((parameters) =>
{
// publish single file for all native runtimes (self contained)
Expand Down
20 changes: 18 additions & 2 deletions build/utils/utils.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public static List<string> ExecGitCmd(this ICakeContext context, string cmd)
return redirectedOutput.ToList();
}


DirectoryPath HomePath()
{
return IsRunningOnWindows()
Expand Down Expand Up @@ -122,14 +121,31 @@ GitVersion GetVersion(BuildParameters parameters)
return gitVersion;
}

void ValidateVersion(BuildParameters parameters)
{
var gitVersionTool = GetFiles($"artifacts/**/bin/{parameters.CoreFxVersion31}/GitVersion.dll").FirstOrDefault();
IEnumerable<string> output;
var fullFxResult = StartProcess(
"dotnet",
new ProcessSettings {
Arguments = $"\"{gitVersionTool}\" -version",
RedirectStandardOutput = true,
},
out output
);

var outputStr = string.Concat(output);

Assert.Equal(parameters.Version.SemVersion, outputStr);
}

void RunGitVersionOnCI(BuildParameters parameters)
{
// set the CI build version number with GitVersion
if (!parameters.IsLocalBuild)
{
var settings = new GitVersionSettings
{
UpdateAssemblyInfo = true,
LogFilePath = "console",
OutputType = GitVersionOutput.BuildServer
};
Expand Down
7 changes: 0 additions & 7 deletions src/GitVersionCore/Extensions/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;

[assembly: AssemblyTitle("GitVersionCore")]
[assembly: AssemblyProduct("GitVersion")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
[assembly: InternalsVisibleTo("GitVersionTask.Tests")]
[assembly: InternalsVisibleTo("GitVersion")]
[assembly: InternalsVisibleTo("GitVersionCore.Tests")]
[assembly: InternalsVisibleTo("GitVersionExe.Tests")]

[assembly: AssemblyInformationalVersion("4.0.0+Branch.master.Sha.e715eb5dd515037d90a257f527e62442cae8c1c5")]
1 change: 0 additions & 1 deletion src/GitVersionCore/GitVersionCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>GitVersion</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DocumentationFile>bin\$(Configuration)\GitVersionCore.xml</DocumentationFile>
<NoWarn>1591</NoWarn>

Expand Down
7 changes: 0 additions & 7 deletions src/GitVersionExe/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;

[assembly: AssemblyTitle("GitVersion")]
[assembly: AssemblyProduct("GitVersion")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
[assembly: InternalsVisibleTo("GitVersionTask.Tests")]
[assembly: InternalsVisibleTo("AcceptanceTests")]
[assembly: InternalsVisibleTo("GitVersionExe.Tests")]

[assembly: AssemblyInformationalVersion("4.0.0+Branch.master.Sha.e715eb5dd515037d90a257f527e62442cae8c1c5")]
1 change: 0 additions & 1 deletion src/GitVersionExe/GitVersionExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<RootNamespace>GitVersion</RootNamespace>
<AssemblyName>GitVersion</AssemblyName>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PlatformTarget>AnyCPU</PlatformTarget>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
Expand Down