Skip to content

Commit

Permalink
Clean up merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfoslund
sfoslund committed Aug 5, 2020
1 parent fe2d181 commit f15a896
Show file tree
Hide file tree
Showing 21 changed files with 230 additions and 108 deletions.
2 changes: 2 additions & 0 deletions eng/restore-toolset.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ set DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_INSTALL_DIR
set PATH=$env:DOTNET_INSTALL_DIR;%PATH%
set NUGET_PACKAGES=$env:NUGET_PACKAGES
DOSKEY killdotnet=taskkill /F /IM dotnet.exe /T ^& taskkill /F /IM VSTest.Console.exe /T ^& taskkill /F /IM msbuild.exe /T
"@

Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"vs-opt": {
"version": "16.8"
},
"xcopy-msbuild": "16.8.0-preview1"
"xcopy-msbuild": "16.8.0-preview2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1"
}
}
17 changes: 11 additions & 6 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1104: "}</note>
</trans-unit>
<trans-unit id="InvalidTargetPlatformVersion">
<source>NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<source>NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</source>
<target state="new">NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<target state="new">NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</target>
<note>{StrBegin="NETSDK1139: "}</note>
<note>{StrBegin="NETSDK1140: "}</note>
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: 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. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>
Expand Down Expand Up @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1048: Cesty AdditionalProbingPaths byly zadány pro GenerateRuntimeConfigurationFiles, ale vynechávají se, protože RuntimeConfigDevPath je prázdné.</target>
<note>{StrBegin="NETSDK1048: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkIsEol">
<source>NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
<target state="new">NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
<note>{StrBegin="NETSDK1138: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkWithSemicolon">
<source>NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead.</source>
<target state="translated">NETSDK1046: Hodnota TargetFramework {0} není platná. Pokud chcete cílit na více cílů, použijte raději vlastnost TargetFrameworks.</target>
Expand Down Expand Up @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1045: "}</note>
</trans-unit>
<trans-unit id="UnsupportedTargetPlatformIdentifier">
<source>NETSDK1138: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1138: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1138: "}</note>
<source>NETSDK1139: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1139: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
Expand Down
17 changes: 11 additions & 6 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1104: "}</note>
</trans-unit>
<trans-unit id="InvalidTargetPlatformVersion">
<source>NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<source>NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</source>
<target state="new">NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<target state="new">NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</target>
<note>{StrBegin="NETSDK1139: "}</note>
<note>{StrBegin="NETSDK1140: "}</note>
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: 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. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>
Expand Down Expand Up @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1048: Für GenerateRuntimeConfigurationFiles wurden "AdditionalProbingPaths" angegeben, sie werden jedoch übersprungen, weil "RuntimeConfigDevPath" leer ist.</target>
<note>{StrBegin="NETSDK1048: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkIsEol">
<source>NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
<target state="new">NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
<note>{StrBegin="NETSDK1138: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkWithSemicolon">
<source>NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead.</source>
<target state="translated">NETSDK1046: Der TargetFramework-Wert "{0}" ist nicht gültig. Verwenden Sie für mehrere Ziele die Eigenschaft "TargetFrameworks".</target>
Expand Down Expand Up @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1045: "}</note>
</trans-unit>
<trans-unit id="UnsupportedTargetPlatformIdentifier">
<source>NETSDK1138: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1138: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1138: "}</note>
<source>NETSDK1139: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1139: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
Expand Down
17 changes: 11 additions & 6 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1104: "}</note>
</trans-unit>
<trans-unit id="InvalidTargetPlatformVersion">
<source>NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<source>NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</source>
<target state="new">NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<target state="new">NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</target>
<note>{StrBegin="NETSDK1139: "}</note>
<note>{StrBegin="NETSDK1140: "}</note>
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: 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. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>
Expand Down Expand Up @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1048: Se especificaron valores adicionales de "AdditionalProbingPaths" para GenerateRuntimeConfigurationFiles, pero se van a omitir porque el valor de "RuntimeConfigDevPath" está vacío.</target>
<note>{StrBegin="NETSDK1048: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkIsEol">
<source>NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
<target state="new">NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
<note>{StrBegin="NETSDK1138: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkWithSemicolon">
<source>NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead.</source>
<target state="translated">NETSDK1046: El valor de TargetFramework "{0}" no es válido. Para varios destinos, use en su lugar la propiedad "TargetFrameworks".</target>
Expand Down Expand Up @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1045: "}</note>
</trans-unit>
<trans-unit id="UnsupportedTargetPlatformIdentifier">
<source>NETSDK1138: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1138: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1138: "}</note>
<source>NETSDK1139: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1139: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
Expand Down
17 changes: 11 additions & 6 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1104: "}</note>
</trans-unit>
<trans-unit id="InvalidTargetPlatformVersion">
<source>NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<source>NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</source>
<target state="new">NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<target state="new">NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</target>
<note>{StrBegin="NETSDK1139: "}</note>
<note>{StrBegin="NETSDK1140: "}</note>
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: 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. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>
Expand Down Expand Up @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1048: Des 'AdditionalProbingPaths' ont été spécifiés pour GenerateRuntimeConfigurationFiles, mais ils sont ignorés, car 'RuntimeConfigDevPath' est vide.</target>
<note>{StrBegin="NETSDK1048: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkIsEol">
<source>NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
<target state="new">NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
<note>{StrBegin="NETSDK1138: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkWithSemicolon">
<source>NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead.</source>
<target state="translated">NETSDK1046: La valeur TargetFramework '{0}' est non valide. Pour effectuer un multiciblage, utilisez la propriété 'TargetFrameworks' à la place.</target>
Expand Down Expand Up @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1045: "}</note>
</trans-unit>
<trans-unit id="UnsupportedTargetPlatformIdentifier">
<source>NETSDK1138: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1138: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1138: "}</note>
<source>NETSDK1139: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1139: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
Expand Down
17 changes: 11 additions & 6 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1104: "}</note>
</trans-unit>
<trans-unit id="InvalidTargetPlatformVersion">
<source>NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<source>NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</source>
<target state="new">NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
<target state="new">NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include:
{2}</target>
<note>{StrBegin="NETSDK1139: "}</note>
<note>{StrBegin="NETSDK1140: "}</note>
</trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: 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. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>
Expand Down Expand Up @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1048: per GenerateRuntimeConfigurationFiles è stato specificato 'AdditionalProbingPaths', ma questo valore verrà ignorato perché 'RuntimeConfigDevPath' è vuoto.</target>
<note>{StrBegin="NETSDK1048: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkIsEol">
<source>NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
<target state="new">NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
<note>{StrBegin="NETSDK1138: "}</note>
</trans-unit>
<trans-unit id="TargetFrameworkWithSemicolon">
<source>NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead.</source>
<target state="translated">NETSDK1046: il valore '{0}' di TargetFramework non è valido. Per impostare più destinazioni, usare la proprietà 'TargetFrameworks'.</target>
Expand Down Expand Up @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl
<note>{StrBegin="NETSDK1045: "}</note>
</trans-unit>
<trans-unit id="UnsupportedTargetPlatformIdentifier">
<source>NETSDK1138: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1138: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1138: "}</note>
<source>NETSDK1139: The target platform identifier {0} was not recognized.</source>
<target state="new">NETSDK1139: The target platform identifier {0} was not recognized.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
Expand Down
Loading

0 comments on commit f15a896

Please sign in to comment.