Skip to content

Commit 59abc25

Browse files
nagilsonnagilson
committed
Clean up remaining tests with removed solution file gunk code that can be auto-generated by new testsolution library
1 parent d94f360 commit 59abc25

31 files changed

+103
-100
lines changed

‎src/Cli/dotnet/CommonLocalizableStrings.resx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,4 @@ The default is 'true' if a runtime identifier is specified.</value>
708708
<data name="CorruptSolutionProjectFolderStructure" xml:space="preserve">
709709
<value>The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio."</value>
710710
</data>
711-
<data name="SolutionProjectConfigurationsConflict" xml:space="preserve">
712-
<value>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
713-
{1}</value>
714-
</data>
715711
</root>

‎src/Cli/dotnet/ReleasePropertyProjectLocator.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.DotNet.Cli.Utils;
1616
using Microsoft.DotNet.Tools;
1717
using Microsoft.DotNet.Tools.Common;
18+
using Microsoft.NET.Build.Tasks;
1819

1920
namespace Microsoft.DotNet.Cli
2021
{
@@ -202,7 +203,7 @@ public IEnumerable<string> GetCustomDefaultConfigurationValueIfSpecified()
202203
// 1) This error should not be thrown in VS because it is part of the SDK CLI code
203204
// 2) If PublishRelease or PackRelease is disabled via opt out, or Configuration is specified, we won't get to this code, so we won't error
204205
// 3) This code only gets hit if we are in a solution publish setting, so we don't need to worry about it failing other publish scenarios
205-
throw new GracefulException(CommonLocalizableStrings.SolutionProjectConfigurationsConflict, _propertyToCheck, String.Join("\n", (configuredProjects).Select(x => x.FullPath)));
206+
throw new GracefulException(Strings.SolutionProjectConfigurationsConflict, _propertyToCheck, String.Join("\n", (configuredProjects).Select(x => x.FullPath)));
206207
}
207208

208209
return configuredProjects.Any() ? configuredProjects.First() : null;

‎src/Cli/dotnet/dotnet.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<EmbeddedResource Update="ToolManifest\*.resx" Namespace="Microsoft.DotNet.ToolManifest" />
7575
<EmbeddedResource Update="NugetSearch\*.resx" Namespace="Microsoft.DotNet.NugetSearch" />
7676
<EmbeddedResource Update="NugetPackageDownloader\*.resx" Namespace="Microsoft.DotNet.Cli.NuGetPackageDownloader" />
77+
<EmbeddedResource Include="$(RepoRoot)src\Tasks\Common\Resources\Strings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.NET.Build.Tasks" />
7778
</ItemGroup>
7879
<ItemGroup>
7980
<ProjectReference Include="../Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" />

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ Pokud se zadá identifikátor modulu runtime, výchozí hodnota je true.</target
242242
<target state="translated">Odstranit</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">Aktualizovat</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ Der Standardwert lautet TRUE, wenn eine Runtime-ID angegeben wird.</target>
242242
<target state="translated">löschen</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">Aktualisieren</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ El valor predeterminado es "true" si se especifica un identificador de entorno d
242242
<target state="translated">Eliminar</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">Actualizar</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ La valeur par défaut est 'true' si un identificateur de runtime est spécifié.
242242
<target state="translated">supprimer</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">Mettre à jour</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ L'impostazione predefinita è 'true' se si specifica un identificatore di runtim
242242
<target state="translated">Elimina</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">Aggiorna</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ The default is 'true' if a runtime identifier is specified.</source>
242242
<target state="translated">削除</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">更新</target>

‎src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ The default is 'true' if a runtime identifier is specified.</source>
242242
<target state="translated">삭제</target>
243243
<note />
244244
</trans-unit>
245-
<trans-unit id="SolutionProjectConfigurationsConflict">
246-
<source>Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
247-
{1}</source>
248-
<target state="new">Multiple solution project(s) contain conflicting '{0}' values; ensure the values match. Consider using a Directory.build.props file to set all project configurations. Conflicting projects:
249-
{1}</target>
250-
<note />
251-
</trans-unit>
252245
<trans-unit id="Update">
253246
<source>Update</source>
254247
<target state="translated">업데이트</target>

0 commit comments

Comments
 (0)