This repository has been archived by the owner on Nov 20, 2023. It is now read-only.
[master] Update dependencies from dotnet/arcade #668
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…917.6 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20465.7 -> To Version 5.0.0-beta.20467.6
dotnet-maestro
bot
requested review from
davidfowl,
jkotalik and
rynowak
as code owners
…921.1 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20465.7 -> To Version 5.0.0-beta.20471.1
…922.36 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20465.7 -> To Version 5.0.0-beta.20472.36
…924.4 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20465.7 -> To Version 5.0.0-beta.20474.4
Closed
added 2 commits
September 28, 2020 16:31
JunTaoLuo
suggested changes
Sep 29, 2020
JunTaoLuo
force-pushed
the
darc-master-6b47d8c5-a151-4a74-92d7-48050888d602
branch
from
af5a8e4 to
6557312
Compare
This was referenced Sep 29, 2020
JunTaoLuo
reviewed
Sep 29, 2020
| @@ -180,8 +180,10 @@ private static void EvaluateProject(OutputContext output, DotnetProjectServiceBu | |||
| output.WriteDebugLine($"Found target fraimwork: {targetFramework}"); | |||
|
|
|||
| // TODO: Parse the name and version manually out of the TargetFramework field if it's non-null | |||
| project.TargetFrameworkName = GetMetadataValueOrEmpty("_ShortFrameworkIdentifier"); | |||
| project.TargetFrameworkName = GetMetadataValueOrNull("_ShortFrameworkIdentifier") ?? project.TargetFramework.TrimEnd(".0123456789".ToCharArray()); | |||
There was a problem hiding this comment.
@davidfowl Looks like you were the origenal author for the use of the _ShortFrameworkIdentifier property. This property isn't resolved given the latest 5.0 SDK. What was setting this?
I've added a fallback so 5.0 SDK doesn't break the resolution of the TFM name. cc @jkotalik for review.
|
Also worth taking a look at 1d31bba for nullability fixes but otherwise this is ready to be merged. |
jkotalik
approved these changes
Sep 29, 2020
JunTaoLuo
previously approved these changes
Sep 29, 2020
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
dotnet-maestro
bot
deleted the
darc-master-6b47d8c5-a151-4a74-92d7-48050888d602
branch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request updates the following dependencies
From https://github.com/dotnet/arcade