diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index c266ba56be2f..bd81bf0be606 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -123,6 +123,13 @@ protected bool TryHandleWorkloadUpdateFromVersion(ITransactionContext context, D _workloadInstaller.UpdateInstallMode(_sdkFeatureBand, true); } + // Delete the current advertising manifest because if we fail to find the right workload version, we want to fail. + var advertisingPackagePath = Path.Combine(_userProfileDir, "sdk-advertising", _sdkFeatureBand.ToString(), "microsoft.net.workloads"); + if (Directory.Exists(advertisingPackagePath)) + { + Directory.Delete(advertisingPackagePath, recursive: true); + } + _workloadManifestUpdater.DownloadWorkloadSet(_workloadSetVersionFromGlobalJson ?? _workloadSetVersion, offlineCache); return TryInstallWorkloadSet(context, out updates, throwOnFailure: true); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx index 5aff919c0705..261628f9a0fc 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx @@ -160,6 +160,6 @@ No workload update found. - Workload version {0} not found. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf index 4228a8117c0a..42786306f30d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Verze úlohy {0} nebyla nalezena. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Verze úlohy {0} nebyla nalezena. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf index e740d3b5fdda..510a28fb82db 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Die Workloadversion „{0}“ wurde nicht gefunden. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Die Workloadversion „{0}“ wurde nicht gefunden. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf index 5519d360b888..849fdf7b4a8a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - No se encontró la versión de carga de trabajo {0}. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + No se encontró la versión de carga de trabajo {0}. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf index 0df26d1c4936..6175baebea07 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Nous n’avons pas pu trouver la version de la charge de travail {0}. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Nous n’avons pas pu trouver la version de la charge de travail {0}. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf index f8a853bab73c..daaa0c4b68b5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Versione del carico di lavoro {0} non trovata. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Versione del carico di lavoro {0} non trovata. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf index fdaf954d5f0d..7447fdbbc8e7 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - ワークロード バージョン {0} が見つかりませんでした。 + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + ワークロード バージョン {0} が見つかりませんでした。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf index 44bb501b1579..4e274d308bfb 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - 워크로드 버전 {0}을(를) 찾을 수 없습니다. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + 워크로드 버전 {0}을(를) 찾을 수 없습니다. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf index de69fac76dc2..569e606cb03b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Nie znaleziono wersji obciążenia {0}. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Nie znaleziono wersji obciążenia {0}. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf index e3bdb7df5f71..6195174dc3c9 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - A versão da carga de trabalho {0} não foi encontrada. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + A versão da carga de trabalho {0} não foi encontrada. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf index 687aca812e9e..919520501a63 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - Версия рабочей нагрузки {0} не найдена. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + Версия рабочей нагрузки {0} не найдена. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf index 5ab2d025566b..94fa1d97a6c1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - {0} iş yükü sürümü bulunamadı. + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + {0} iş yükü sürümü bulunamadı. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf index 8e99dc9984ff..e768f341c8cc 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - 找不到工作负载版本 {0}。 + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + 找不到工作负载版本 {0}。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf index 9eef806d2028..6920e869066d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -73,8 +73,8 @@ - Workload version {0} not found. - 找不到工作負載版本 {0}。 + Workload version {0} not found. Adding a feed that contains it to your NuGet.config may help. + 找不到工作負載版本 {0}。