Skip to content
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

Repair PrepareRelease tool, publish in line. #624

Merged
merged 5 commits into from
Feb 6, 2020

Conversation

colin-higgins
Copy link
Member

@colin-higgins colin-higgins commented Feb 4, 2020

dotnet publish within the prepare release tool for accurate msi management and drop it to netframework target

@DataDog/apm-dotnet

@colin-higgins colin-higgins requested a review from a team as a code owner February 4, 2020 22:10
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
Copy link
Member

Choose a reason for hiding this comment

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

We keep switching back and forth between having and not having the UTF-8 BOM. Why does the tool even modify this file?

Copy link
Member Author

Choose a reason for hiding this comment

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

The Versions replacement logic does this. You suggested we add this option to the versioning tool when it was implemented: new UTF8Encoding(encoderShouldEmitUTF8Identifier: false)

Copy link
Member

Choose a reason for hiding this comment

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

Oh, yeah. I remember. I wonder what keeps adding it, then. Visual Studio? VSCode? Maybe it would be easier to always add the BOM instead of removing it? Level of care is low, as long as we can be consistent and avoid the extra whitespace noise in commit diffs.

@@ -0,0 +1,32 @@

REM SET SOLUTION_DIR=C:\Github\dd-trace-dotnet
Copy link
Member Author

Choose a reason for hiding this comment

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

For stand alone tests

Environment.SetEnvironmentVariable("TRACER_HOME_OUTPUT_DIR", tracerHomeOutput);

var publishBatch = Path.Combine(solutionDir, "tools", "PrepareRelease", "publish-all.bat");
ExecuteCommand(publishBatch);
Copy link
Collaborator

@zacharycmontoya zacharycmontoya Feb 5, 2020

Choose a reason for hiding this comment

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

Can you make the publish part an optional "Job" like versions and integrations? I would also opt to make it off by default because we don't need to run it when we do a new release.

Copy link
Member Author

Choose a reason for hiding this comment

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

The plan was to have it be a pre-req for the integrations and MSI steps below.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll nest it within the MSI section for now, as that's the only place it's really used.

Copy link
Member

@lucaspimentel lucaspimentel left a comment

Choose a reason for hiding this comment

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

Still WIP, but I'm ok merging this for now.

@colin-higgins colin-higgins merged commit a13c4ff into master Feb 6, 2020
@colin-higgins colin-higgins deleted the colin/repair-prepare-release branch February 6, 2020 15:43
@colin-higgins colin-higgins added this to the 1.13.0 milestone Feb 14, 2020
@colin-higgins colin-higgins self-assigned this Feb 14, 2020
@colin-higgins colin-higgins added the area:builds project files, build scripts, pipelines, versioning, releases, packages label Feb 14, 2020
MikeGoldsmith pushed a commit to lightstep/ls-trace-dotnet that referenced this pull request Mar 20, 2020
* Repair PrepareRelease tool, publish for dependency list
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.

3 participants