Update shared framework to target netcoreapp1.1#462
Conversation
This allows for folks to build the packages without doing a full repo build after they have built the full repo at least once they can now just call pack.cmd/sh.
|
|
||
| DOTNET_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh" | ||
| curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --version 1.0.0-preview3-003223-3 --verbose | ||
| curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --version 1.0.0-preview3-003886 --verbose |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Split the dependencies in Microsoft.NETCore.App based on 1.0 and 1.1. We also needed to update some tests to be netcoreapp1.1 targeting now
5925351 to
b9f4ccc
Compare
|
@mellinoe what are our options to keep the new distro's working as well as picking up the latest nuget libraries as part of the CLI to enable correct restore due to the framework mappings. |
Or
|
| } | ||
| } | ||
| string targetFramework = Environment.GetEnvironmentVariable("TARGETFRAMEWORK") ?? "netcoreapp1.0"; | ||
| string targetFramework = Environment.GetEnvironmentVariable("TARGETFRAMEWORK") ?? "netcoreapp1.1"; |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Excluding comments from @mellinoe about CLI download for the new repos, it seems reasonable to me. |
I think that we should setup those builds in the preview3 channel. @livarcocc is anyone working on enabling builds for the new distro's? If not what do we need to do to make that happen as without it we will not be able to update the shared framework in master. |
ericstj
left a comment
There was a problem hiding this comment.
Code changes look OK, but it looks like you'll need more changes to get the CI to pass.
| @@ -43,10 +42,147 @@ | |||
|
|
|||
| <File Include="$(PlaceholderFile)" > | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
https://ci.dot.net/job/dotnet_core-setup/job/master/job/release_ubuntu_x64_prtest/57/console @schellap any ideas why on the linux builds we hit that failure? Looking at https://github.com/dotnet/core-setup/blob/master/tools/independent/RuntimeGraphGenerator/RuntimeGraphManager.cs#L22 it should only ever try to find that runtime.json file if it was in the deps.json file which I would expect it to only be in there if it were in the package. I'm kind of at a lose as to what might cause this error. |
|
@weshaggard I am referring to https://github.com/dotnet/core-setup/issues/456 |
|
@mellinoe has been helping prime the CLI builds for new distros for which official CLI builds are not available and should be able to help prime them for the build you want. |
That is a similar fix but it is independent, I just filed PR #464 for that. |
I think that this is the rel/1.0.0 branch in CLI (I can never keep the branches straight). Since that one is up to date and using new packages, I'm hoping it isn't a lot of work to enable the build there. I can take a crack at it in a little bit. Hopefully it is just:
|
|
@schellap PTAL as well. |
|
It looks like updating the rel/1.0.0 branch of CLI is going to be quite a bit more complicated than before, because we are now always downloading the "latest" version of CLI there, and that version seems to be controlled by a single text file, rather than one-per-distro. So even if we uploaded a bootstrap CLI for that version, it would become out-of-date once a new "latest.version" file was uploaded. |
|
@mellinoe Are you sure that master of CLI, which consumes master of Core-Setup, is expected to be in release/1.0.0, as opposed to Preview3? @livarcocc @piotrpMSFT Can you please chime in as well? We need to get the CLI dependency sorted soon not only yo unblock this PR, but also the PGO work of PErf team and #465. |
I'm not sure I understand what you're asking. I thought that the "preview3" version listed above (in the "Sdk" channel) comes from the rel/1.0.0 branch of CLI. But that may be incorrect; I have a very hard time trying to keep those versions lined up in my head. |
|
I think we need to do two things here:
@schellap Can you please look into why this is happening for the host package?
Since both these issues are blocking the adoption of master payloads (from CoreCLR and CoreFX), @schellap @livarcocc @piotrpMSFT please do prioritize looking into this. |
|
I am able to repro this locally on Linux Mint |
|
Here is the suspect problem. The new CLI is bringing the new nuget which creates folders (say, for a package restore operation) in lowercase. Later, the RuntimeGraphGenerator code is getting the path in CamelCasing. As a result, on Linux OS where file system access is case-sensitive, the mismatch happens and file is not found. I will keep this updated as I look into a possible solution. |
|
@weshaggard I have a local fix for the issue above. This affects crossgen of shared FX as well, so I am fixing few more places. Once I am done, I will push an update into your branch. |
|
I have fixed the lower-casing issues that broke the above builds. However, now I see something else: As can be seen above, the tests (under TestAssets folder) are being published with runtimeconfig.json that reference "1015" as the commit count, while M.N.App is built with version "1011". And I have confirmed that the commit count is, indeed, 1011 in the branch. @weshaggard Why the tests are getting published with this version? I dont see anything in your change that could result in this? Could this be a CLI bug @livarcocc ? |
|
I was not able to push changes to your branch @weshaggard, so I have created a new PR with my fixes for the various issues at #524. The last issue I am running into is the mismatch of SharedFW build number above. |
|
closing in favor of #524 |
|
Closing in favor of #524 |
@ericstj can you please have a look Microsoft.NETCore.App changes. I essentially copied all the dependencies from the what is in release/1.0.0 branch which we will need to keep updated with whatever versions we bump in that branch. I was considering using your harvesting but I didn't figure it would map easily in this repo setup for meta-packages.
@dagood this PR replaces #460.
@gkhanna79 @mellinoe could you guys please take a look.