Skip to content

Update branding to 3.0.1 #2392

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

Merged
merged 8 commits into from
Sep 27, 2019
Merged

Update branding to 3.0.1 #2392

merged 8 commits into from
Sep 27, 2019

Conversation

dougbu
Copy link

@dougbu dougbu commented Sep 24, 2019

  • aspnet/AspNetCore-Internal#3153

@@ -20,7 +39,8 @@
-->
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
<UseLatestPackageReferences
Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
Copy link
Author

Choose a reason for hiding this comment

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

Similar to dotnet/aspnetcore#14404, the changes in this file are all about nits. The change here is again about the redundancy of checking '$(IsServicingBuild)' != 'true' twice.

@dougbu
Copy link
Author

dougbu commented Sep 26, 2019

Not good. Even a seemingly-successful leg of the build (Ubuntu 16.04 Debug) hit package resolution conflicts referring to projects elsewhere in the repo.

/home/vsts/work/1/s/.dotnet/sdk/3.0.100-preview8-013656/Microsoft.Common.CurrentVersion.targets(2106,5): error MSB3243: No way to resolve conflict between "Microsoft.Extensions.Caching.SqlServer, Version=3.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60" and "Microsoft.Extensions.Caching.SqlServer, Version=3.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60". Choosing "Microsoft.Extensions.Caching.SqlServer, Version=3.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60" arbitrarily.

Not sure where the 3.0.0 versions is coming from. Checking whether this reproduces locally…

- aspnet/AspNetCore-Internal#3153
- add `$(IgnorePackageBaselines)` property

nits:
- add general comment in ResolveReferences.targets
- remove `$(RestoreSources)` settings
- no changes in known frameworks, targeting pack features, et cetera

nits:
- remove downlevel patches from PatchConfig.props
- remove extra checks and whitespace from `Condition`s in ResolveReferences.targets
- copy general comment from AspNetCore's ResolveReferences.targets
@dougbu dougbu force-pushed the dougbu/branding.3.0.1 branch from 6f5f9c3 to a2777af Compare September 26, 2019 18:17
- do not pack Microsoft.Internal.Extensions.Refs when servicing (either)
- use `$(IsPackable)` property to clarify conditions
@dougbu
Copy link
Author

dougbu commented Sep 27, 2019

/bump reviewers
(Success❕ All checks have passed)

@dougbu dougbu merged commit de43594 into release/3.0 Sep 27, 2019
@ghost ghost deleted the dougbu/branding.3.0.1 branch September 27, 2019 19:24
@ghost ghost locked as resolved and limited conversation to collaborators May 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants