Skip to content

Upgrader: do not include Micrsoft.Diagnostic.Tracing.EventSource#1145

Merged
jamill merged 1 commit into
microsoft:releases/servicingfrom
jamill:upgrader_fix_port_servicing
May 10, 2019
Merged

Upgrader: do not include Micrsoft.Diagnostic.Tracing.EventSource#1145
jamill merged 1 commit into
microsoft:releases/servicingfrom
jamill:upgrader_fix_port_servicing

Conversation

@jamill
Copy link
Copy Markdown
Member

@jamill jamill commented May 10, 2019

The upgrade verb attempts to copy
Microsoft.Diagnostic.Tracing.EventSource when copying the
ProductUpgrader to the temporary directory to run. If this file is not
present, then the upgrade verb will fail. This following commit removes
this file:

cbe5787 ("Remove in-proc ETW trace event listener", 2019-02-18)

Clean installs of VFS4G that include this commit will no longer have
this file in the installation directory, and will not be able to
upgrade.

This dll is no longer needed or installed during installation, so we
remove it from the list of files copied over for upgrade.

This is a quick fix - we will also see how to make this less fragile.
One option might be to install "upgrader app" into its own directory
under the VFS For Git installation directory, and then just copy the
directory to the temp location, instead of providing a list of files
that need to be kept in sync.

(cherry picked from commit f107731)

The upgrade verb attempts to copy
Microsoft.Diagnostic.Tracing.EventSource when copying the
ProductUpgrader to the temporary directory to run. If this file is not
present, then the upgrade verb will fail. This following commit removes
this file:

  cbe5787 ("Remove in-proc ETW trace event listener", 2019-02-18)

Clean installs of VFS4G that include this commit will no longer have
this file in the installation directory, and will not be able to
upgrade.

This dll is no longer needed or installed during installation, so we
remove it from the list of files copied over for upgrade.

This is a quick fix - we will also see how to make this less fragile.
One option might be to install "upgrader app" into its own directory
under the VFS For Git installation directory, and then just copy the
directory to the temp location, instead of providing a list of files
that need to be kept in sync.

(cherry picked from commit f107731)
@jamill jamill requested review from derrickstolee and wilbaker May 10, 2019 17:01
@jamill
Copy link
Copy Markdown
Member Author

jamill commented May 10, 2019

This branch was created off of the v1.0.19116.1 release tag, as we will want this fix to go to that release train

@jamill jamill merged commit 403ce6f into microsoft:releases/servicing May 10, 2019
@jrbriggs jrbriggs modified the milestones: M151, M150 May 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants