Skip to content

move <Version> to new Common.props #7112

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Datadog.Trace.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
tracer\Commons.props = tracer\Commons.props
tracer\Datadog.Trace.proj = tracer\Datadog.Trace.proj
Datadog.Trace.snk = Datadog.Trace.snk
tracer\Directory.Build.props = tracer\Directory.Build.props
Expand Down
4 changes: 2 additions & 2 deletions tracer/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PropertyGroup>
<SolutionDir Condition="'$(SolutionDir)'==''">$(MSBuildThisFileDirectory)..\</SolutionDir>
</PropertyGroup>

<!-- OS Detection Properties -->
<PropertyGroup>
<IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
Expand Down Expand Up @@ -59,5 +59,5 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions);MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=1</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>

</Project>
12 changes: 6 additions & 6 deletions tracer/build/_build/Build.GitHub.cs
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,11 @@ await client.Issue.Milestone.Update(
"tracer/samples/ConsoleApp/Debian.dockerfile",
"tracer/samples/OpenTelemetry/Debian.dockerfile",
"tracer/samples/WindowsContainer/Dockerfile",
"tracer/src/Common.props",
"tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs",
"tracer/src/Datadog.Tracer.Native/CMakeLists.txt",
"tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h",
"tracer/src/Datadog.Tracer.Native/Resource.rc",
"tracer/src/Directory.Build.props",
"tracer/src/Datadog.Trace/TracerConstants.cs",
};

Expand Down Expand Up @@ -993,17 +993,17 @@ await client.Issue.Milestone.Update(
var build = failed.OrderBy(c => c.State.Value).First();
Logger.Warning("- {Job} ({Status}) {Link}", failed.Key, build.State, build.TargetUrl);
}

throw new Exception("Some gitlab jobs did not build/test successfully. Please check the builds for details about why.");
}

var stages = string.Join(", ", ssiStatuses.Select(x => x.Key));
Logger.Information("All gitlab build stages ({Stages}) completed successfully", stages);

// assert that the docker image for the commit is present
var image = $"ghcr.io/datadog/dd-trace-dotnet/dd-lib-dotnet-init:{CommitSha}";
VerifyDockerImageExists(image);

if(new Version(Version).Major < 3)
{
image = $"{image}-musl";
Expand Down Expand Up @@ -1032,7 +1032,7 @@ async Task ReplaceCommentInPullRequest(int prNumber, string title, string markdo
try
{
Console.WriteLine("Replacing comment in GitHub");

var clientId = "nuke-ci-client";
var productInformation = Octokit.GraphQL.ProductHeaderValue.Parse(clientId);
var connection = new Octokit.GraphQL.Connection(productInformation, GitHubToken);
Expand All @@ -1045,7 +1045,7 @@ async Task ReplaceCommentInPullRequest(int prNumber, string title, string markdo
.Select(comment => new { comment.Id, comment.Body, comment.IsMinimized });

var prComments = (await connection.Run(query)).ToList();

Console.WriteLine($"Found {prComments.Count} comments for PR {prNumber}");

var updated = false;
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/_build/Build.Utilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ partial class Build
// Samples need to use the latest version (i.e. the _current_ build version, before updating)
new SetAllVersions.Samples(TracerDirectory, Version, IsPrerelease).Run();
// Source needs to use the _actual_ version
new SetAllVersions.Source(TracerDirectory, NewVersion, NewIsPrerelease.Value!).Run();
new SetAllVersions.Source(TracerDirectory, NewVersion, NewIsPrerelease!.Value).Run();
});

Target AnalyzePipelineCriticalPath => _ => _
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/_build/PrepareRelease/SetAllVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public override void Run()
text => Regex.Replace(text, "readonly bool IsPrerelease = (true|false)", $"readonly bool IsPrerelease = {(IsPrerelease ? "true" : "false")}"));

SynchronizeVersion(
"src/Directory.Build.props",
"src/Common.props",
NugetVersionReplace);

// Fully qualified name updates
Expand Down
8 changes: 8 additions & 0 deletions tracer/src/Common.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<PropertyGroup>

<!-- Version of dd-trace-dotnet -->
<Version>3.20.0</Version>

</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion tracer/src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<Import Project="$(MSBuildThisFileDirectory)Common.props" />

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>3.20.0</Version>

<!-- Code analysis -->
<AnalysisLevel>latest</AnalysisLevel>
Expand Down
Loading