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

Create userlocal workload installation marker file for source build #12021

Conversation

dsplaisted
Copy link
Member

@dsplaisted dsplaisted commented Sep 18, 2021

Fixes #12104

@dsplaisted
Copy link
Member Author

@dseefeld @dleeapho Can you take a look at this? What's the best way to test it? Should we just merge it and then verify that the next source-build build installs the blazor-wasm workload locally?

FYI @tmds @omajid

@dsplaisted dsplaisted force-pushed the workload-userlocal-sourcebuild branch from 4a658bb to a9e2a94 Compare September 18, 2021 01:14
@@ -466,6 +466,12 @@
Overwrite="true" />
</Target>

<Target Name="LayoutWorkloadUserLocalMarker">
<WriteLinesToFile File="$(RedistLayoutPath)metadata/workloads/userlocal"
Copy link
Member

Choose a reason for hiding this comment

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

In the issue, the version directory was lost when I copied over the information from the PR.
The path should include a version: /metadata/workloads/<sdkfeatureband>/userlocal.

The <sdkfeatureband> must not include the -suffix. So 6.0.100 (not 6.0.100-rc1).

@@ -466,6 +466,12 @@
Overwrite="true" />
</Target>

<Target Name="LayoutWorkloadUserLocalMarker">

Choose a reason for hiding this comment

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

I think the file should only be written when building with source-build. i.e. Condition=" '$(DotNetBuildFromSource)' == 'true' "

@dseefeld
Copy link

@dseefeld @dleeapho Can you take a look at this? What's the best way to test it? Should we just merge it and then verify that the next source-build build installs the blazor-wasm workload locally?

FYI @tmds @omajid

You should be able to take the source tarball in the CI build artifacts (dotnet-sdk-source-6.0.100.tar.gz) and build it locally to test out the change. If you'd like me to help with that, let me know.

@@ -466,6 +466,13 @@
Overwrite="true" />
</Target>

<Target Name="LayoutWorkloadUserLocalMarker"
Condition="'$(DotNetBuildFromSource)' == 'true'">
<WriteLinesToFile File="$(RedistLayoutPath)metadata/workloads/$(CliProductBandVersion)00/userlocal"
Copy link
Member

Choose a reason for hiding this comment

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

This 00 looks like it may not be correct for patch releases?

Copy link
Member

Choose a reason for hiding this comment

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

nvmd, it's correct.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, that property is rather confusing.

@dseefeld
Copy link

@dsplaisted I downloaded and built the tarball from CI and it does create the file in the correct location and workloads were installed to my home directory.

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