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

Update 2.1.6 for respin #845

Merged
merged 4 commits into from
Nov 1, 2018
Merged

Update 2.1.6 for respin #845

merged 4 commits into from
Nov 1, 2018

Conversation

dagood
Copy link
Member

@dagood dagood commented Oct 31, 2018

Local build in progress to regen baselines if necessary.

New manifest: https://github.com/dotnet/versions/tree/c9bc176e798111c2ad9815cc1ef79b02ea9c8e94/build-info/dotnet/product/cli/release/2.1.6

CLI diff: dotnet/cli@14c7845...d5e54bf

MSBuild: Microsoft.Build/15.9.20
88f5fadf... in DLL 🙁

Roslyn: Microsoft.CodeAnalysis.CSharp/2.10.0-beta2-63410-10
45b3711... from nuspec 🙂

@dagood dagood self-assigned this Oct 31, 2018
@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />

<PropertyGroup>
<NuGetPackageVersion>2.3.2-beta1-61921-05</NuGetPackageVersion>
<NuGetPackageVersion>2.10.0-beta2-63410-10</NuGetPackageVersion>
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 don't think this has been affecting roslyn package version (anymore?). A build I did before this PR produced e.g. Microsoft.CodeAnalysis.CSharp.2.8.0 even though this was 2.3.2-beta1-61921-05. Will comment here again with the version this PR ends up producing.

Doesn't seem like a problem because of forced auto-update, but we could get rid of this to be less misleading.

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, produces Microsoft.CodeAnalysis.CSharp.2.10.0 now.

@dagood
Copy link
Member Author

dagood commented Oct 31, 2018

Roslyn fails:

    Restore completed in 3.33 sec for /work/src/roslyn/src/Compilers/CSharp/csc/csc.csproj.
  /work/Tools/dotnetcli/sdk/2.1.403/Roslyn/Microsoft.Managed.Core.targets(90,5): error : SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true [/work/src/roslyn/src/NuGet/NuGetProjectPackUtil.csproj]
  /work/Tools/dotnetcli/sdk/2.1.403/Roslyn/Microsoft.Managed.Core.targets(90,5): error : SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true [/work/src/roslyn/src/Compilers/Core/Portable/CodeAnalysis.csproj]
  /work/Tools/dotnetcli/sdk/2.1.403/Roslyn/Microsoft.Managed.Core.targets(90,5): error : SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true [/work/src/roslyn/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj]

  Build FAILED.

This update is over 3,000 commits! We missed some updates over time, it looks like. We're doing:
dotnet/roslyn@362ec0e...45b3711
but the CLI package version diff only spans 144 commits:
dotnet/roslyn@4b223d5...45b3711

Investigating.


Worked around by disabling DeterministicSourcePaths. See dotnet/sourcelink#91. Seems likely it has to do with

In projects that reference SourceLink package SourceRoot items are populated by SourceLink since it knows where the repository root is.

and us using submodules. (And even if it worked with submodules, tarball build would have been even worse without any .git at all.) Maybe there's more we can pass in to tell the repo where SourceRoot is.

@dagood dagood merged commit be0bf32 into dotnet:release/2.1 Nov 1, 2018
@dagood dagood deleted the update-2.1.6 branch November 1, 2018 14:27
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