Skip to content

Copy satellites in deployment script#5260

Merged
rainersigwald merged 1 commit into
dotnet:masterfrom
cdmihai:copySatellitesInDeploymentScript
Apr 21, 2020
Merged

Copy satellites in deployment script#5260
rainersigwald merged 1 commit into
dotnet:masterfrom
cdmihai:copySatellitesInDeploymentScript

Conversation

@cdmihai

@cdmihai cdmihai commented Apr 8, 2020

Copy link
Copy Markdown
Contributor

Extracted this from #5222

When I tried the deployment script msbuild failed not finding the satellite assemblies. Apparently this happens when you're testing msbuild bits with new resources.

Comment on lines +62 to +65
FileToCopy "$bootstrapBinDirectory\en\Microsoft.Build.resources.dll" "en"
FileToCopy "$bootstrapBinDirectory\en\Microsoft.Build.Tasks.Core.resources.dll" "en"
FileToCopy "$bootstrapBinDirectory\en\Microsoft.Build.Utilities.Core.resources.dll" "en"
FileToCopy "$bootstrapBinDirectory\en\MSBuild.resources.dll" "en"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we need en resources? I thought they were always embedded as default?

@cdmihai cdmihai Apr 15, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That was my understanding as well until I got missing resource failures. I also deployed release bits, maybe those behave differently. I vaguely remember at some point, some email thread, where somebody suggested we don't treat en resources any differently to capture more possible bugs, so maybe I actually implemented that but forgot :)

And whatever scheme we had in the past, probably got replaced by whatever the xliff package is doing.

)

Set-StrictMode -Version "Latest"
$ErrorActionPreference = "Stop"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Wishlist item that may be too hard to implement: Building out the error functionality to delete the folder that was generated for this particular build, or essentially "reset" to the original binaries.

@cdmihai cdmihai Apr 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I restore original binaries by adding the VS msbuild bin dir under git, committing before I deploy, and doing a checkout and clean to restore. And then I have to restore and commit for each VS update, which gets a bit annoying, but alas, that's the VS design for ya. If I were to implement restoration of original binaries, that's how I would do it. But I'd rather not do it in this PR :)

@rainersigwald rainersigwald merged commit 73c84c6 into dotnet:master Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants