Skip to content

Enable prerelease version tags, bump to v1.9.1-prerelease#556

Merged
colin-higgins merged 10 commits into
masterfrom
colin/release/1.9.1-prerelease
Nov 14, 2019
Merged

Enable prerelease version tags, bump to v1.9.1-prerelease#556
colin-higgins merged 10 commits into
masterfrom
colin/release/1.9.1-prerelease

Conversation

@colin-higgins

Copy link
Copy Markdown
Member

v1.9.1-prerelease

@DataDog/apm-dotnet

@colin-higgins colin-higgins requested a review from a team as a code owner November 13, 2019 22:14
@colin-higgins colin-higgins self-assigned this Nov 13, 2019
@bobuva

bobuva commented Nov 13, 2019

Copy link
Copy Markdown
Contributor

Before we merge this, let's manually run MSI tests including upgrading to make sure it works as expected.

bobuva
bobuva previously approved these changes Nov 13, 2019

@bobuva bobuva left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, see my comment about manual MSI tests

@colin-higgins

Copy link
Copy Markdown
Member Author

@bobuva The only thing that changes in this PR is the nuget packaging. I'll test the MSI after making the versioning changes we talked about, for basing the MSI verison on something hard coded.

@zacharycmontoya

Copy link
Copy Markdown
Contributor

@colin-higgins Sorry, I wasn't clear if this PR would address the MSI versioning, but if you were going to tackle that, you could either hard-code the version directly in Product.wxs, or hard-code the InstallerVersion property that is set in Datadog.Trace.ClrProfiler.WindowsInstaller.wixproj, that way the command line argument is no longer used.

@zacharycmontoya

Copy link
Copy Markdown
Contributor

Maybe it would just be easier to set the values in Datadog.Trace.ClrProfiler.WindowsInstaller.wixproj because that is where you can set the OutputName property to generate the filename with the prerelease tag as part of the filename. Just be sure to delete the InstallerVersion and OutputName command line arguments in the packages.yml file

@zacharycmontoya

zacharycmontoya commented Nov 14, 2019

Copy link
Copy Markdown
Contributor

And yet another suggestion, maybe just remove the Condition="'$(InstallerVersion)'==''" and Condition="'$(OutputName)'==''" that way we never override the version from command line arguments, we always rely on the definition in the wixproj file

Comment thread tools/Datadog.Core.Tools/EnvironmentTools.cs
Comment thread tools/Datadog.Core.Tools/Datadog.Core.Tools.csproj Outdated
Comment thread deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Product.wxs Outdated
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: These can probably be reduced to something like net45;netstandard2.0 but no need to block on this.

Comment thread .azure-pipelines/packages.yml

@zacharycmontoya zacharycmontoya left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'm so happy that now everything will be defined in source code 😄

@colin-higgins

Copy link
Copy Markdown
Member Author

Just need to update the release docs... :D

@colin-higgins colin-higgins added the area:builds project files, build scripts, pipelines, versioning, releases, packages label Nov 14, 2019
@colin-higgins colin-higgins added this to the 1.9.1 milestone Nov 14, 2019
@lucaspimentel lucaspimentel changed the title Enable prerelease format, bump to v1.9.1-prerelease Enable prerelease version tags, bump to v1.9.1-prerelease Nov 14, 2019
@colin-higgins colin-higgins merged commit 3b842cc into master Nov 14, 2019
@colin-higgins colin-higgins deleted the colin/release/1.9.1-prerelease branch November 14, 2019 20:46
@colin-higgins colin-higgins modified the milestones: 1.9.1, 1.9.1-prerelease Nov 14, 2019
MikeGoldsmith pushed a commit to lightstep/ls-trace-dotnet that referenced this pull request Mar 20, 2020
* Enable prerelease format, bump to v1.9.1-prerelease
MikeGoldsmith pushed a commit to lightstep/ls-trace-dotnet that referenced this pull request Mar 27, 2020
* Enable prerelease format, bump to v1.9.1-prerelease
macrogreg pushed a commit that referenced this pull request Aug 20, 2021
* Enable prerelease format, bump to v1.9.1-prerelease
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:builds project files, build scripts, pipelines, versioning, releases, packages

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants