Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Update to the 3.0 SDK #1173

Merged
merged 4 commits into from
May 8, 2019
Merged

Update to the 3.0 SDK #1173

merged 4 commits into from
May 8, 2019

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented May 1, 2019 •
edited
Loading

CC @ViktorHofer @ericstj. This also contains a maestro update of Arcade dependencies.

@wtgodbe
Copy link
Member Author

wtgodbe commented May 1, 2019

Looking at the build failures locally

@wtgodbe wtgodbe requested review from a team as code owners May 2, 2019 22:03
@terrajobst terrajobst requested review from ericstj and ViktorHofer and removed request for a team May 2, 2019 22:38
@terrajobst
Copy link
Member

I've removed the board as they are only approving API changes. I've added the folks you CCed as reviewers.

@wtgodbe
Copy link
Member Author

wtgodbe commented May 3, 2019 •
edited
Loading

@riarenas Upgrading to the 3.0.100-preview4 version of the SDK caused that version of dotnet to be installed in C:\Program Files on my box - seems like bad behavior. Is this a known issue?

Also, the build failures are because CI bypasses root build.cmd/build.sh entirely, so I think I need to update the invocations in the yaml file.

@wtgodbe
Copy link
Member Author

wtgodbe commented May 3, 2019

Also @riarenas it appears eng/common/build.sh doesn't have any way of supporting warnAsMessage, though it does support warnAsError. Presumably there's other random args that I can't pass through that script either, as anything not in its default set of arguments is rejected as an unknown arg (eng\common\build.cmd doesn't have the same restriction)

@wtgodbe
Copy link
Member Author

wtgodbe commented May 3, 2019

If Nuget resolves NuGet/Home#8093, we won't have to manually insert WarnAsMessage, but until that task recognizes Project NoWarns, we're stuck with this workaround

@wtgodbe
Copy link
Member Author

wtgodbe commented May 6, 2019

Testing to see if my fix to eng\common\build.sh worked, if so I'll put up a PR in Arcade

@wtgodbe wtgodbe mentioned this pull request May 6, 2019
Merged
@wtgodbe
Copy link
Member Author

wtgodbe commented May 6, 2019

dotnet/arcade#2696

@wtgodbe
Copy link
Member Author

wtgodbe commented May 6, 2019

dotnet/arcade#2696 is in, once it flows to Standard I'll rebase this PR

@wtgodbe
Copy link
Member Author

wtgodbe commented May 7, 2019

I've combined this PR with #1172, since that auto-update PR also needed to set WarnAsMessage for NU1702. CC @ericstj

@wtgodbe wtgodbe mentioned this pull request May 7, 2019
Closed
@wtgodbe
Copy link
Member Author

wtgodbe commented May 7, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@wtgodbe wtgodbe force-pushed the 30SDK branch 4 times, most recently from ee504c0 to 154f2b5 Compare May 7, 2019 17:46
wtgodbe and others added 2 commits May 7, 2019 10:56
@wtgodbe
Update to the 3.0 SDK
2f11f62
@wtgodbe
Update dependencies from https://github.com/dotnet/arcade build 20190…
97902dd 
…506.12

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19256.12
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19256.12
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19256.12
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19256.12
@wtgodbe wtgodbe mentioned this pull request May 7, 2019
Closed
@wtgodbe
Copy link
Member Author

wtgodbe commented May 7, 2019

CI is green now, @ericstj @ViktorHofer could you guys please take a look?

ericstj
ericstj reviewed May 7, 2019
View reviewed changes
src/netstandard/pkg/shims/Directory.Build.targets Outdated
@@ -24,6 +24,12 @@
</ItemGroup>
</Target>

<!-- These projects have an unconventional ordering for the import of Directory.Build.Targets, so we have to manually
Copy link
Member

Choose a reason for hiding this comment

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

Why don't we just delete the explicit imports of Directory.Build.Targets from the shims projects and let them be brought in by the SDK targets?

Copy link
Member Author

Choose a reason for hiding this comment

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

Trying this out locally now, it requires shuffling a few things around. dotnet-install is taking forever so progress is slow.

Copy link
Member Author

@wtgodbe wtgodbe May 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@ericstj I just pushed a commit to address this. I checked the artifacts dir against a version built against master, everything appears to be unchanged.

@wtgodbe wtgodbe merged commit b169999 into dotnet:master May 8, 2019
@karelz karelz added this to the .NET Standard 2.1 milestone Jul 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ericstj ericstj ericstj approved these changes

@ViktorHofer ViktorHofer Awaiting requested review from ViktorHofer

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
.NET Standard 2.1
Development

Successfully merging this pull request may close these issues.
4 participants
@wtgodbe @terrajobst @ericstj @karelz