Skip to content

LOC CHECKIN | dotnet/sdk master | 20190114#2819

Merged
nguerrera merged 2 commits into
dotnet:masterfrom
v-zbsail:loc_20190114_master
Jan 15, 2019
Merged

LOC CHECKIN | dotnet/sdk master | 20190114#2819
nguerrera merged 2 commits into
dotnet:masterfrom
v-zbsail:loc_20190114_master

Conversation

@v-zbsail
Copy link
Copy Markdown
Contributor

No description provided.

</trans-unit>
<trans-unit id="NoRuntimePackAvailable">
<source>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</source>
<target state="new">NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</target>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some of these have had the target node removed entirely.

This is causing xliff-tasks to crash.

FYI, @tmeschter.

I'm doing a fixup, but we should understand the root cause.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Hi Nick, the string is not localized in the platform yet. (new string) and seems tool is stripping target tag when no translation exist. We will log this as request to be fixed by the tool owners.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, yes. It should leave the target alone in this case.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This was handled better in the past, by the way, so this seems to be a new problem.

Long ago, I requested changes to be made against the branch as it was when the handoff occurred, and then let git identify conflicts. We could then resolve by accepting in favor of the handback and letting the tool add back the new strings. That would address this among other things.

@nguerrera nguerrera self-assigned this Jan 14, 2019
@nguerrera nguerrera merged commit 137286e into dotnet:master Jan 15, 2019
wli3 pushed a commit that referenced this pull request Feb 7, 2020
….7 (#2819)

- Microsoft.DotNet.Cli.Runtime - 3.1.100-preview1.19461.7
wli3 pushed a commit that referenced this pull request Feb 7, 2020
…elease/3.1.1xx-to-master

* upstream/release/3.1.1xx: (603 commits)
  [release/3.0.1xx] Update dependencies from microsoft/vstest (#2809)
  Update dependencies from https://github.com/dotnet/cli build 20190911.11 (#2823)
  Update dependencies from https://github.com/dotnet/cli build 20190911.7 (#2819)
  Update dependencies from https://github.com/dotnet/cli build 20190911.6 (#2818)
  Update dependencies from https://github.com/aspnet/websdk build 20190911.2 (#2816)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#2815)
  Update dependencies from https://github.com/dotnet/cli build 20190911.1 (#2807)
  Update dependencies from https://github.com/dotnet/fsharp build 20190910.5 (#2804)
  Update dependencies from https://github.com/dotnet/cli build 20190910.6 (#2803)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.13 (#2802)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.12 (#2801)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.11 (#2800)
  Update dependencies from https://github.com/dotnet/cli build 20190910.5 (#2799)
  Update dependencies from https://github.com/aspnet/websdk build 20190910.5 (#2798)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.5 (#2797)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#2796)
  Update dependencies from https://github.com/dotnet/cli build 20190910.4 (#2794)
  Update dependencies from https://github.com/aspnet/websdk build 20190910.4 (#2795)
  Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.3 (#2793)
  [release/3.0.1xx] Update dependencies from aspnet/AspNetCore-Tooling (#2759)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
eng/common/native/install-cmake-test.sh
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