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.

Sign up for GitHub

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

Merge release/2.0.0 into master #1602

Merged
merged 54 commits into from
Sep 25, 2017
Merged

Merge release/2.0.0 into master #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2d96a13
Insert NuGet Build 4.3.0-rtm-4324 into sdk
nugetlurker Jul 23, 2017
f8d87cb
Merge pull request #1444 from dotnet/nuget-insertbuild4324
nguerrera Jul 25, 2017
b9d2904
Adds fallback folder for full framework projects.
livarcocc Jul 7, 2017
2a7fdf2
Changing the condition to not use fallback folder to trigger only on …
livarcocc Jul 24, 2017
f59804d
Free metadata reader and assembly after reading metadata
ericstj Jul 25, 2017
ac3c196
Re-enable tests and update the CLI to the one containing the new NuGe…
livarcocc Jul 26, 2017
417b675
Merge pull request #1409 from livarcocc/improve_fallback_folder
Jul 26, 2017
ea06429
LOC CHECKIN | sdk-release/2.0.0 | 20170726
v-zbsail Jul 26, 2017
48a3c4b
Merge pull request #1457 from v-zbsail/moravia_loc
Jul 26, 2017
f078aca
Add telemetry data points for .NET Core 2.0
Jun 1, 2017
2d5667f
Merge pull request #1456 from ericstj/freeMetadata
Jul 27, 2017
1c3d823
Update error message text when 2.0 SDK is required to build a project
dsplaisted Jul 27, 2017
e27eeed
Merge pull request #1461 from dsplaisted/update-2.0-required-message
Jul 28, 2017
89f0296
Insert NuGet Build 4.3.0-rtm-4382 into sdk
nugetlurker Aug 4, 2017
bccfa68
Bump CLI version
nguerrera Aug 4, 2017
64fa6fd
Merge pull request #1472 from dotnet/nuget-insertbuild4382
nguerrera Aug 4, 2017
893982d
Update branding 2.0.1-servicing
Aug 4, 2017
6c58918
Update version to 2.0.2-vspre
dsplaisted Aug 16, 2017
09da039
Merge pull request #1504 from dsplaisted/release/2.0-vs
dsplaisted Aug 16, 2017
df2abd2
Insert NuGet Build 4.4.0-preview1-4365 and corresponding CLI version …
dsplaisted Aug 17, 2017
b38114b
Revert "Update version to 2.0.2-vspre"
dsplaisted Aug 17, 2017
d509a1c
Merge pull request #1505 from dotnet/revert-1504-release/2.0-vs
dsplaisted Aug 17, 2017
9ee6d73
Merge pull request #1506 from dsplaisted/release/2.0-vs
dsplaisted Aug 17, 2017
4481953
Disable multilevel lookup in build/test to prevent accidental machine…
nguerrera Aug 17, 2017
f8d2186
Bump default versions for self-contained apps
nguerrera Aug 18, 2017
6274bb6
Merge pull request #1519 from nguerrera/2.0-default-ver
nguerrera Aug 21, 2017
2debd7b
Insert NuGet Build 4.4.0-preview1-4434 into sdk
nugetlurker Aug 22, 2017
623b546
fix intermediate nuspec path
Aug 24, 2017
7fdfc89
Update DotnetCLIVersion
Aug 25, 2017
7ef4b4b
Merge pull request #1528 from dotnet/nuget-insertbuild4434
Aug 25, 2017
5e8546b
Revert self-contained implicit versions to 1.0.5/1.1.2/2.0.0
nguerrera Sep 8, 2017
96f80f1
Merge pull request #1574 from nguerrera/rollback-2.0
nguerrera Sep 11, 2017
2df15b5
Update support libraries to those that are only lib.
ericstj Sep 12, 2017
e0c9b27
Insert NuGet Build 4.4.0-preview3-4475 into sdk
nugetlurker Sep 14, 2017
187bc20
Disable multilevel lookup in build/test to prevent accidental machine…
nguerrera Aug 17, 2017
82888a0
Disable multilevel lookup for Tests
dsplaisted Sep 6, 2017
28102a0
Use correct target path for runtimeTargets items when resolving confl…
dsplaisted Sep 6, 2017
db98a33
Change log verbosity to normal when checking whether projects encount…
dsplaisted Sep 6, 2017
7bdd496
Add comment clarifying test expectation
dsplaisted Sep 7, 2017
a5b0502
Take locale portion of target path for satellite assemblies into acco…
dsplaisted Sep 7, 2017
ebbf880
Fix satellite assembly conflict resolution when targeting .NET Core
dsplaisted Sep 11, 2017
2955e55
Add build/test environment scripts
dsplaisted Sep 13, 2017
34da6b6
Fix perf regression with setting DestinationSubPath on items for conf…
dsplaisted Sep 13, 2017
65bb756
Fix test issue with path separator character
dsplaisted Sep 13, 2017
0c0ffce
Merge pull request #1582 from ericstj/updateNetFxNS2Bits
ericstj Sep 14, 2017
3b62083
Merge upstream changes
dsplaisted Sep 14, 2017
399aa14
Merge pull request #1565 from dsplaisted/1510-conflict-resolution
dsplaisted Sep 14, 2017
8ad4009
Merge upstream changes
dsplaisted Sep 21, 2017
f4661d4
Update CLI version
dsplaisted Sep 21, 2017
48c1df7
Merge pull request #1585 from dotnet/nuget-insertbuild4475
Sep 21, 2017
4ef82a2
Merge branch 'release/2.0-vs' into merge_release20_vs
livarcocc Sep 22, 2017
fe87160
Merge pull request #1600 from dotnet/merge_release20_vs
Sep 22, 2017
2e1d6d6
Merge branch 'release/2.0.0' into merge_release200
livarcocc Sep 22, 2017
f1fe4af
Pinning the SDK version to 2.0.2, because that has the right NuGet ve…
livarcocc Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<VersionPrefix Condition="'$(VersionPrefix)' == ''">2.1.0</VersionPrefix>
<BuildEpoch>20170101</BuildEpoch>
<VersionPrereleasePrefix Condition="'$(VersionPrereleasePrefix)' == ''">preview1</VersionPrereleasePrefix>

<!-- When running on VSO (for official builds) use a real number. -->
<BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
<BuildNumber Condition="'$(BuildNumber)' == ''">00000001-01</BuildNumber>
Expand Down
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0-preview1-007041
2.0.2-vspre-006963
12 changes: 0 additions & 12 deletions ...s/TestProjects/DesktopUsingPackageWithSatellites/DesktopUsingPackageWithSatellites.csproj
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions TestAssets/TestProjects/DesktopUsingPackageWithSatellites/Program.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<MsBuildPackagesVersion>15.2.0-preview-000093-02</MsBuildPackagesVersion>
<DependencyModelVersion>2.0.0-preview1-001960</DependencyModelVersion>
<PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion>
<NuGetVersion>4.4.0-preview1-4365</NuGetVersion>
<NuGetVersion>4.4.0-preview3-4475</NuGetVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25405-01</NETStandardLibraryNETFrameworkVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25708-01</NETStandardLibraryNETFrameworkVersion>
<XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,6 @@
<value>Resolved file has a bad image, no metadata, or is otherwise inaccessible. {0}</value>
</data>
<data name="UnsupportedSDKVersionForNetStandard20" xml:space="preserve">
<value>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</value>
<value>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</value>
</data>
</root>
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">Verze sady Microsoft.NET.Sdk používaná tímto projektem nestačí pro podporu sady .NET Standard 2.0, kterou vyžadují odkazy tohoto projektu. Nainstalujte verzi 2.0 nebo vyšší sady .NET Core SDK.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">Verze sady Microsoft.NET.Sdk používaná tímto projektem nestačí pro podporu sady .NET Standard 2.0, kterou vyžadují odkazy tohoto projektu. Nainstalujte verzi 2.0 nebo vyšší sady .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="SkippingAdditionalProbingPaths">
Expand All @@ -329,7 +329,7 @@
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">Platforma RuntimeIdentifier a PlatformTarget se musí shodovat.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">Die von diesem Projekt verwendete Microsoft.NET.Sdk-Version ist für die Unterstützung von .NET Standard 2.0 nicht ausreichend, was für die Verweise dieses Projekts jedoch erforderlich ist. Installieren Sie Version 2.0 oder höher des .NET Core SDK.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">Die von diesem Projekt verwendete Microsoft.NET.Sdk-Version ist für die Unterstützung von .NET Standard 2.0 nicht ausreichend, was für die Verweise dieses Projekts jedoch erforderlich ist. Installieren Sie Version 2.0 oder höher des .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">Die RuntimeIdentifier-Plattform und PlatformTarget müssen übereinstimmen.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">La versión de Microsoft.NET.Sdk que se usa en este proyecto no es suficiente para admitir .NET Standard 2.0, que es necesario para las referencias de este proyecto. Instale la versión 2.0 o superior del SDK de .NET Core.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">La versión de Microsoft.NET.Sdk que se usa en este proyecto no es suficiente para admitir .NET Standard 2.0, que es necesario para las referencias de este proyecto. Instale la versión 2.0 o superior del SDK de .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">Las plataformas RuntimeIdentifier y PlatformTarget deben coincidir.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">La version de Microsoft.NET.Sdk utilisée par ce projet ne permet pas de prendre en charge .NET Standard 2.0, lequel est nécessaire aux références de ce projet. Installez la version 2.0 ou une version ultérieure du kit .NET Core SDK.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">La version de Microsoft.NET.Sdk utilisée par ce projet ne permet pas de prendre en charge .NET Standard 2.0, lequel est nécessaire aux références de ce projet. Installez la version 2.0 ou une version ultérieure du kit .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">La plateforme RuntimeIdentifier et la PlatformTarget doivent correspondre.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">La versione di Microsoft.NET.Sdk usata da questo progetto non è sufficiente per supportare .NET Standard 2.0 che è richiesto dai riferimenti di questo progetto. Installare la versione 2.0 o successiva di .NET Core SDK.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">La versione di Microsoft.NET.Sdk usata da questo progetto non è sufficiente per supportare .NET Standard 2.0 che è richiesto dai riferimenti di questo progetto. Installare la versione 2.0 o successiva di .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">La piattaforma di RuntimeIdentifier e quella di PlatformTarget devono corrispondere.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">このプロジェクトで使用される Microsoft.NET.Sdk のバージョンは、このプロジェクトの参照で必要な .NET Standard 2.0 をサポートするには不十分です。.NET Core SDK のバージョン 2.0 以降をインストールしてください。</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">このプロジェクトで使用される Microsoft.NET.Sdk のバージョンは、このプロジェクトの参照で必要な .NET Standard 2.0 をサポートするには不十分です。.NET Core SDK のバージョン 2.0 以降をインストールしてください。</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">RuntimeIdentifier プラットフォームと PlatformTarget は一致している必要があります。</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">이 프로젝트에서 사용하는 Microsoft.NET.Sdk 버전이 이 프로젝트의 참조에서 필요로 하는 .NET 표준 2.0을 지원할 수 없습니다. .NET Core SDK 버전 2.0 이상을 설치하세요.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">이 프로젝트에서 사용하는 Microsoft.NET.Sdk 버전이 이 프로젝트의 참조에서 필요로 하는 .NET 표준 2.0을 지원할 수 없습니다. .NET Core SDK 버전 2.0 이상을 설치하세요.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">RuntimeIdentifier 플랫폼과 PlatformTarget은 일치해야 합니다.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">Używana przez ten projekt wersja zestawu Microsoft.NET.Sdk jest niewystarczająca do zapewnienia obsługi środowiska .NET Standard 2.0 wymaganego przez odwołania występujące w tym projekcie. Zainstaluj zestaw .NET Core SDK w wersji co najmniej 2.0.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">Używana przez ten projekt wersja zestawu Microsoft.NET.Sdk jest niewystarczająca do zapewnienia obsługi środowiska .NET Standard 2.0 wymaganego przez odwołania występujące w tym projekcie. Zainstaluj zestaw .NET Core SDK w wersji co najmniej 2.0.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">Platforma RuntimeIdentifier i wartość PlatformTarget muszą być zgodne.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">A versão do Microsoft.NET.Sdk usado por este projeto é insuficiente para dar suporte ao .NET Standard 2.0, que é exigido pelas referências deste projeto. Instale a versão 2.0 ou superior do SDK .NET Core.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">A versão do Microsoft.NET.Sdk usado por este projeto é insuficiente para dar suporte ao .NET Standard 2.0, que é exigido pelas referências deste projeto. Instale a versão 2.0 ou superior do SDK .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">A plataforma RuntimeIdentifier e a PlatformTarget devem corresponder.</target>
<note />
</trans-unit>
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@
<note />
</trans-unit>
<trans-unit id="UnsupportedSDKVersionForNetStandard20">
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support .NET Standard 2.0 which is required by this project's references. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="translated">Используемая для этого проекта версия Microsoft.NET.SDK недостаточна для поддержки версии .NET Standard 2.0, необходимой согласно документам по этому проекту. Установите пакет SDK для .NET Core версии 2.0 или более поздней.</target>
<source>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</source>
<target state="needs-review-translation">Используемая для этого проекта версия Microsoft.NET.SDK недостаточна для поддержки версии .NET Standard 2.0, необходимой согласно документам по этому проекту. Установите пакет SDK для .NET Core версии 2.0 или более поздней.</target>
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="new">The RuntimeIdentifier platform and the PlatformTarget must match.</target>
<target state="translated">Платформа RuntimeIdentifier и PlatformTarget должны совпадать.</target>
<note />
</trans-unit>
</body>
Expand Down
Loading