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.

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

Roll forward self-contained apps to latest patch version #2085

Merged
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
2 changes: 1 addition & 1 deletion build/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- Toolset Dependencies -->
<PropertyGroup>
<DotNetCliVersion>2.1.300-preview2-008290</DotNetCliVersion>
<DotNetCliVersion>2.1.300-preview3-008414</DotNetCliVersion>
<RoslynToolsRepoToolsetVersion>1.0.0-beta-62615-02</RoslynToolsRepoToolsetVersion>
<VSWhereVersion>2.2.7</VSWhereVersion>
</PropertyGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/Tasks/Common/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -336,4 +336,10 @@
<data name="ErrorReadingAssetsFile" xml:space="preserve">
<value>Error reading assets file: {0}</value>
</data>
<data name="MismatchedPlatformPackageVersion" xml:space="preserve">
<value>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</value>
<comment>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</comment>
</data>
</root>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
7 changes: 7 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@
<target state="new">Error reading assets file: {0}</target>
<note />
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</source>
<target state="new">The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore.</target>
<note>{0} - Package Identifier for platform package
{1} - Restored version of platform package
{2} - Current version of platform package</note>
</trans-unit>
</body>
</file>
</xliff>
Loading