From 559bfd36dbc424ae2de7c445ac6b0a4ce2f87334 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 23 Aug 2024 00:31:54 -0700 Subject: [PATCH 01/10] Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10000931 (#10267) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299 * Increase VersionPrefix version --------- Co-authored-by: Jenny Bai --- eng/Versions.props | 2 +- src/Build/Resources/xlf/Strings.cs.xlf | 2 +- src/Build/Resources/xlf/Strings.de.xlf | 4 +- src/Build/Resources/xlf/Strings.es.xlf | 2 +- src/Build/Resources/xlf/Strings.fr.xlf | 2 +- src/Build/Resources/xlf/Strings.it.xlf | 2 +- src/Build/Resources/xlf/Strings.pl.xlf | 14 ++-- src/Build/Resources/xlf/Strings.pt-BR.xlf | 4 +- src/Build/Resources/xlf/Strings.ru.xlf | 2 +- src/Build/Resources/xlf/Strings.tr.xlf | 2 +- src/Build/Resources/xlf/Strings.zh-Hans.xlf | 4 +- src/Build/Resources/xlf/Strings.zh-Hant.xlf | 2 +- src/MSBuild/Resources/xlf/Strings.cs.xlf | 64 +++++++++---------- src/MSBuild/Resources/xlf/Strings.de.xlf | 25 ++++---- src/MSBuild/Resources/xlf/Strings.es.xlf | 37 +++++------ src/MSBuild/Resources/xlf/Strings.fr.xlf | 22 +++---- src/MSBuild/Resources/xlf/Strings.it.xlf | 44 ++++++------- src/MSBuild/Resources/xlf/Strings.ja.xlf | 12 ++-- src/MSBuild/Resources/xlf/Strings.ko.xlf | 16 ++--- src/MSBuild/Resources/xlf/Strings.pl.xlf | 37 +++++------ src/MSBuild/Resources/xlf/Strings.pt-BR.xlf | 13 ++-- src/MSBuild/Resources/xlf/Strings.ru.xlf | 14 ++-- src/MSBuild/Resources/xlf/Strings.tr.xlf | 60 ++++++++--------- src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf | 16 ++--- src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf | 16 ++--- .../Resources/xlf/Strings.shared.cs.xlf | 2 +- src/Tasks/Resources/xlf/Strings.es.xlf | 24 +++---- src/Tasks/Resources/xlf/Strings.it.xlf | 4 +- 28 files changed, 212 insertions(+), 236 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1fa71c720eb..08c714dae44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.4release + 17.11.5release 17.10.4 15.1.0.0 preview diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index e5550f67e95..fcecdd70acb 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -1677,7 +1677,7 @@ Chyby: {3} Skipping because the "$(AspNetConfiguration)" configuration is not supported for this web project. You can use the AspNetConfiguration property to override the configuration used for building web projects, by adding /p:AspNetConfiguration=<value> to the command line. Currently web projects only support Debug and Release configurations. - Vynecháno, protože konfigurace $(AspNetConfiguration) není pro tento webový projekt podporována. Pomocí vlastnosti AspNetConfiguration můžete přepsat konfiguraci používanou k sestavování webových projektů, a to přidáním příkazu /p:AspNetConfiguration=<hodnota> do příkazového řádku. Webové projekty nyní podporují pouze konfigurace Debug a Release. + Vynecháno, protože konfigurace "$(AspNetConfiguration)" není pro tento webový projekt podporována. Pomocí vlastnosti AspNetConfiguration můžete přepsat konfiguraci používanou k sestavování webových projektů, a to přidáním příkazu /p:AspNetConfiguration=<hodnota> do příkazového řádku. Webové projekty nyní podporují pouze konfigurace Debug a Release. UE: This is not an error, so doesn't need an error code. LOCALIZATION: Do NOT localize "AspNetConfiguration", "Debug", "Release". diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 84db08c0b46..35f2da9139e 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -543,7 +543,7 @@ The "{0}" resolver attempted to resolve the SDK "{1}". Warnings: {2} Errors: {3} - Der Konfliktlöser „{0}“ hat versucht, das SDK „{1}“ aufzulösen. + Der Konfliktlöser "{0}" hat versucht, das SDK "{1}" aufzulösen. Warnungen: {2} Fehler: {3} @@ -669,7 +669,7 @@ Fehler: {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Dies ist eine nicht behandelte Ausnahme in MSBuild. RUFEN SIE EIN VORHANDENES PROBLEM AUF, ODER ERSTELLEN SIE EIN NEUES UNTER https://aka.ms/msbuild/unhandled + Dies ist ein Ausnahmefehler in MSBuild. STIMMEN SIE EINEM VORHANDENEN ISSUE ZU, ODER ERSTELLEN SIE EIN NEUES ISSUE UNTER https://aka.ms/msbuild/unhandled {0} diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index a96cf8a444c..ed4d862249b 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -543,7 +543,7 @@ The "{0}" resolver attempted to resolve the SDK "{1}". Warnings: {2} Errors: {3} - El resolvedor "{0}" intentó resolver el SDK "{1}". + El solucionador "{0}" intentó resolver el SDK "{1}". Advertencias: {2} Errores: {3} diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 35ef05de40d..09d7417e8ea 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -669,7 +669,7 @@ Erreurs : {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Il s’agit d’une exception non gérée dans MSBuild –– VOTEZ POUR UN PROBLÈME EXISTANT OU ENTREZ UN NOUVEAU FICHIER À https://aka.ms/msbuild/unhandled. + Il s’agit d’une exception non prise en charge dans MSBuild –– VOTEZ POUR UN PROBLÈME EXISTANT OU CRÉEZ-EN UN SUR https://aka.ms/msbuild/unhandled {0} diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 822be56a0c4..d8612855b87 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -543,7 +543,7 @@ The "{0}" resolver attempted to resolve the SDK "{1}". Warnings: {2} Errors: {3} - Il resolver "{0}" ha provato a risolvere l'SDK "{1}". + Il resolver "{0}" ha tentato di risolvere l'SDK "{1}". Avvisi: {2} Errori: {3} diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index 882630d44bb..915e1c478d7 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -38,7 +38,7 @@ ArchiveFile was obtained, but the final edited version was not set. - Uzyskano plik ArchiveFile, ale nie ustawiono ostatecznej edycji wersji. + Uzyskano plik ArchiveFile, ale nie ustawiono ostatecznej edytowanej wersji. @@ -72,7 +72,7 @@ BuildEvent record number {0} was expected to read exactly {1} bytes from the stream, but read {2} instead. - Oczekiwano, że numer rekordu BuildEvent {0} odczyta ze strumienia liczbę bajtów równą dokładnie {1}, ale zamiast tego odczyta {2}. + Oczekiwano, że numer rekordu BuildEvent {0} odczyta ze strumienia liczbę bajtów równą dokładnie {1}, ale zamiast tego odczytał {2}. LOCALIZATION: {0} is an integer number denoting order. {1} is an integer denoting size. {2} is an integer value indicating number of bytes. @@ -91,7 +91,7 @@ Structured events and raw events cannot be replayed at the same time. - Nie można jednocześnie odtwarzać zdarzeń strukturalnych i nieprzetworzonych. + Nie można ponownie odtwarzać jednocześnie zdarzeń strukturalnych i zdarzeń pierwotnych. @@ -116,7 +116,7 @@ Attempt to skip {0} bytes, only non-negative offset up to int.MaxValue is allowed. - Próba pominięcia {0} bajtów, tylko przesunięcie nieujemne do liczby całkowitej. Wartość MaxValue jest dozwolona. + Próba pominięcia {0} bajtów, tylko przesunięcie nieujemne do wartości int.MaxValue jest dozwolone. LOCALIZATION: {0} is integer number denoting number of bytes. 'int.MaxValue' should not be translated. @@ -277,7 +277,7 @@ MSB4017: The build stopped unexpectedly because of an unexpected logger failure. {0} - MSB4017: Kompilacja została nieoczekiwanie zatrzymana z powodu nieoczekiwanego błędu rejestratora. + MSB4017: kompilacja została nieoczekiwanie zatrzymana z powodu nieoczekiwanego błędu rejestratora. {0} {StrBegin="MSB4017: "}UE: This message is used for a special exception that is thrown when a logger fails while logging an event (most likely because of a programming error in the logger). When a logger dies, we cannot proceed with the build, and we throw a @@ -620,7 +620,7 @@ Błędy: {3} The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". - Zestaw SDK „{0}” został pomyślnie rozpoznany przez narzędzie Resolver „{1}” do lokalizacji „{2}” i wersji „{3}”. + Zestaw SDK „{0}” został pomyślnie rozpoznany przez narzędzie Resolver „{1}” w lokalizacji „{2}” i w wersji „{3}”. @@ -669,7 +669,7 @@ Błędy: {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Jest to nieobsługiwany wyjątek w aplikacji MSBuild -- ZAGŁOSUJ NA ISTNIEJĄCY PROBLEM LUB ZAGŁOSUJ NA NOWY NA https://aka.ms/msbuild/unhandled. + Jest to nieobsługiwany wyjątek na platformie MSBuild -- ZAGŁOSUJ NA ISTNIEJĄCY PROBLEM LUB ZAREJESTRUJ NOWY W WITRYNIE https://aka.ms/msbuild/unhandled. {0} diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index fc5a65330ba..d771b923ac1 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -277,7 +277,7 @@ MSB4017: The build stopped unexpectedly because of an unexpected logger failure. {0} - MSB4017: A compilação parou inesperadamente devido a uma falha do agente de log. + MSB4017: a compilação parou inesperadamente devido a uma falha do agente. {0} {StrBegin="MSB4017: "}UE: This message is used for a special exception that is thrown when a logger fails while logging an event (most likely because of a programming error in the logger). When a logger dies, we cannot proceed with the build, and we throw a @@ -669,7 +669,7 @@ Erros: {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Esta é uma exceção não tratada no MSBuild -- POR FAVOR, APOIE UM PROBLEMA EXISTENTE OU ARQUIVE UM NOVO EM https://aka.ms/msbuild/unhandled + Essa é uma exceção não tratada no MSBuild -- POR FAVOR, ATUALIZE UMA QUESTÃO EXISTENTE OU ENCAMINHE UMA NOVA EM https://aka.ms/msbuild/unhandled {0} diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 1be45180f2e..e7f95782fa2 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -669,7 +669,7 @@ Errors: {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Это необработанное исключение в MSBuild. Проголосуйте за существующую проблему или сообщите о новой по адресу https://aka.ms/msbuild/unhandled + Это необработанное исключение в MSBuild. ПРОГОЛОСУЙТЕ ЗА СУЩЕСТВУЮЩУЮ ПРОБЛЕМУ ИЛИ СООБЩИТЕ О НОВУЙ НА https://aka.ms/msbuild/unhandled {0} diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 57b30ef0e67..7b2c41ba190 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -669,7 +669,7 @@ Hatalar: {3} This is an unhandled exception in MSBuild -- PLEASE UPVOTE AN EXISTING ISSUE OR FILE A NEW ONE AT https://aka.ms/msbuild/unhandled {0} - Bu, MSBuild'de işlenmeyen bir istisnadır -- LÜTFEN MEVCUT BİR SORUNU OYLAYIN VEYA https://aka.ms/msbuild/unhandled ADRESİNDE YENİ BİR SORUN DOSYALAYIN + Bu, MSBuild'de işlenmeyen bir istisnadır -- LÜTFEN MEVCUT BİR SORUNU OYLAYIN VEYA https://aka.ms/msbuild/unhandled ADRESİNDE YENİ BİR SORUN OLUŞTURUN {0} diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index c2f5d371a06..ae16a34c59e 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -310,7 +310,7 @@ EvaluationContext objects created with SharingPolicy.Isolated or SharingPolicy.SharedSDKCache do not support being passed an MSBuildFileSystemBase file system. - 使用 SharingPolicy.Isolated 或 SharingPolicy.SharedSDKCache 创建的 EvaluationContext 对象不支持被传递 MSBuildFileSystemBase 文件系统。 + 使用 SharingPolicy.Isolated 创建的 EvaluationContext 对象。SharingPolicy.SharedSDKCache 不支持被传递 MSBuildFileSystemBase 文件系统。 @@ -2598,7 +2598,7 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4229: The value "{0}" is not valid for an Sdk specification. The attribute should be a semicolon-delimited list of Sdk-name/minimum-version pairs, separated by a forward slash. - MSB4229: 值“{0}”对 Sdk 规范无效。此属性应该是以分号分隔的Sdk-name/minimum-version 对（用正斜杠分隔）的列表。 + MSB4229: 值“{0}”对 Sdk 规范无效。此属性应该是以分号分隔的Sdk-name/minimum-version 对 (用正斜杠分隔) 的列表。 {StrBegin="MSB4229: "} diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index e4e829e6388..35ca40afa91 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -277,7 +277,7 @@ MSB4017: The build stopped unexpectedly because of an unexpected logger failure. {0} - MSB4017: 因為未預期的記錄器失敗，建置未預期停止。 + MSB4017: 由於發生未預期的記錄器失敗，因此已中止組建。 {0} {StrBegin="MSB4017: "}UE: This message is used for a special exception that is thrown when a logger fails while logging an event (most likely because of a programming error in the logger). When a logger dies, we cannot proceed with the build, and we throw a diff --git a/src/MSBuild/Resources/xlf/Strings.cs.xlf b/src/MSBuild/Resources/xlf/Strings.cs.xlf index 120aef2c3d9..037adf7fa6c 100644 --- a/src/MSBuild/Resources/xlf/Strings.cs.xlf +++ b/src/MSBuild/Resources/xlf/Strings.cs.xlf @@ -33,14 +33,14 @@ failed with {0} error(s) - selhalo s {0} chybami. + selhalo s {0} chybou/chybami. Part of Terminal Logger summary message: "Build {BuildResult_X} in {duration}s" failed with {0} error(s) and {1} warning(s) - selhalo s {0} chybami a {1} upozorněními. + selhalo s chybami (celkem {0}) a upozorněními (celkem {1}) Part of Terminal Logger summary message: "Build {BuildResult_X} in {duration}s" @@ -61,7 +61,7 @@ succeeded with {0} warning(s) - akce proběhla úspěšně s {0} upozorněním(i). + uspělo s {0} upozorněním(i). Part of Terminal Logger summary message: "Build {BuildResult_X} in {duration}s" @@ -163,22 +163,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Na základě klíče registru Windows LongPathsEnabled má funkce LongPaths hodnotu {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + zakázáno enabled - enabled + povoleno not set - not set + nenastaveno @@ -602,20 +602,17 @@ Když se nastaví na MessageUponIsolationViolation (nebo jeho krátký -logger:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral -logger:XMLLogger,C:\Loggers\MyLogger.dll;OutputAsHTML - -logger:<protok_nást> Použít daný protokolovací nástroj k protokolování - událostí nástroje MSBuild. Chcete-li zadat více protokolovacích. - nástrojů, musíte je zadat jednotlivě. - Syntaxe hodnoty <protok_nást>: - [<třída_protok_nást>,]<sestavení_protok_nást> - [;<param_protok_nást>] - Syntaxe hodnoty <třída_protok_nást>: - [<část/úpl_obor_názvů>.]<náz_tř_protok_nást> - Syntaxe hodnoty <sestavení_protok_nást>: - {<název_sestavení>[,<strong name>] | <soubor_sestavení>} + -logger:<logger> Použít daný protokolovací nástroj k protokolování událostí nástroje MSBuild. Pokud chcete zadat + více protokolovacích nástrojů, musíte je zadat jednotlivě. + Syntaxe hodnoty <logger> je: + [<class>,]<assembly>[,<options>][;<parameters>] + Syntaxe hodnoty <logger class> je: + [<partial or full namespace>.]<logger class name> + Syntaxe hodnoty <logger assembly> je: + {<assembly name>[,<strong name>] | <assembly file>} Parametry protokolovacího nástroje určují, jak MSBuild vytvoří protokolovací nástroj. - Parametry <param_protok_nást> jsou volitelné a předávají se - protokolovacímu nástroji přesně v tom tvaru, v jakém - byly zadány. (Krátký tvar: -l) + Parametry <logger parameters> jsou volitelné a předávají se + protokolovacímu nástroji přesně v tom tvaru, v jakém byly zadány. (Krátký tvar: -l) Příklady: -logger:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral -logger:XMLLogger,C:\Loggers\MyLogger.dll;OutputAsHTML @@ -884,23 +881,20 @@ Když se nastaví na MessageUponIsolationViolation (nebo jeho krátký -dl:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral -dl:MyLogger,C:\My.dll*ForwardingLogger,C:\Logger.dll - -distributedlogger:<centr_protok_nást>*<předáv_protok_nást> - Použít zadaný protokolovací nástroj pro protokolování událostí - z nástroje MSBuild; ke každému uzlu připojit jinou instanci - protokolovacího nástroje. Chcete-li zadat více - protokolovacích nástrojů, uveďte je jednotlivě. + -distributedLogger:<central logger>*<forwarding logger> + Použít zadaný protokolovací nástroj pro protokolování událostí z nástroje MSBuild; ke každému uzlu připojit + jinou instanci protokolovacího nástroje. Pokud chcete zadat více + protokolovacích nástrojů, uveďte je jednotlivě. (Krátký tvar: -dl) - Syntaxe hodnoty <protok_nást>: - [<třída_protok_nást>,]<sestav_protok_nást> - [;<param_protok_nást>] - Syntaxe hodnoty <třída_protok_nást>: - [<část/úpl_obor_názvů>.]<náz_tř_protok_nást> - Syntaxe hodnoty <sestav_protok_nást>: - {<název_sestavení>[,<strong name>] | <soubor_sestavení>} + Syntaxe hodnoty <logger> je: + [<class>,]<assembly>[,<options>][;<parameters>] + Syntaxe hodnoty <logger class> je: + [<partial or full namespace>.]<logger class name> + Syntaxe hodnoty <logger assembly> je: + {<assembly name>[,<strong name>] | <assembly file>} Parametry protokolovacího nástroje určují, jak MSBuild vytvoří protokolovací nástroj. Parametry <param_protok_nást> jsou volitelné a předávají se - protokolovacímu nástroji přesně v zadaném tvaru. - (Krátký tvar: -l) + protokolovacímu nástroji přesně v zadaném tvaru. (Krátký tvar: -l) Příklady: -dl:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral -dl:MyLogger,C:\My.dll*ForwardingLogger,C:\Logger.dll @@ -1088,7 +1082,7 @@ Když se nastaví na MessageUponIsolationViolation (nebo jeho krátký Verbosity=diagnostic;Encoding=UTF-8 -flp:Summary;Verbosity=minimal;LogFile=msbuild.sum - -flp1:warningsonly;logfile=msbuild.wrn + -flp1:warningsonly;logfile=msbuild.wrn -flp2:errorsonly;logfile=msbuild.err diff --git a/src/MSBuild/Resources/xlf/Strings.de.xlf b/src/MSBuild/Resources/xlf/Strings.de.xlf index b428a5c1cf7..dc2f6d470ce 100644 --- a/src/MSBuild/Resources/xlf/Strings.de.xlf +++ b/src/MSBuild/Resources/xlf/Strings.de.xlf @@ -119,12 +119,11 @@ This flag is experimental and may not work as intended. - -reportFileAccesses[:True|Falsch] - Führt dazu, dass MSBuild Dateizugriffe an alle konfigurierten - meldet - Projektcache-Plug-Ins. + -reportFileAccesses[:True|False] + Führt dazu, dass MSBuild Dateizugriffe auf ein beliebiges konfiguriertes + Projektcache-Plug-In meldet. - Dieses Kennzeichen ist experimentell und funktioniert möglicherweise nicht wie vorgesehen. + Dieses Flag ist experimentell und funktioniert möglicherweise nicht wie vorgesehen. LOCALIZATION: "-reportFileAccesses" should not be localized. @@ -163,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Basierend auf dem Windows-Registrierungsschlüssel LongPathsEnabled ist das Feature LongPaths {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + deaktiviert enabled - enabled + aktiviert not set - not set + Nicht festgelegt @@ -601,11 +600,11 @@ Dies ist ein restriktiverer Modus von MSBuild, da er erfordert, -logger:<Protokollierung> Mithilfe dieser Protokollierung werden Ereignisse von MSBuild protokolliert. Um mehrere Protokollierungen anzugeben, wird jede Protokollierung gesondert angegeben. Die Syntax für die <Protokollierung> lautet: - [<Klasse>,]<Assembly>[,<Optionen>][;<Parameter>] + [<Klasse>,]<assembly>[,<Optionen>][;<Parameter>] Die Syntax für die <Protokollierungsklasse> lautet: [<Teilweiser oder vollständiger Namespace>.]<Name der Protokollierungsklasse> Die Syntax für die <Protokollierungsassembly> lautet: - {<Assemblyname>[,<strong name>] | <Assemblydatei>} + {<assembly name>[,<strong name>] | <assembly file>} Die Protokollierungsoptionen geben an, wie MSBuild die Protokollierung erstellt. Die <Protokollierungsparameter> sind optional und werden genau so an die Protokollierung übergeben, wie sie eingegeben wurden. (Kurzform: -l) @@ -883,11 +882,11 @@ Dieses Protokollierungsformat ist standardmäßig aktiviert. gesondert angegeben. (Kurzform -dl) Die Syntax für die <Protokollierung> lautet: - [<Klasse>,]<Assembly>[,<Optionen>][;<Parameter>] + [<Klasse>,]<assembly>[,<Optionen>][;<Parameter>] Die Syntax für die <Protokollierungsklasse> lautet: [<Teilweiser oder vollständiger Namespace>.]<Name der Protokollierungsklasse> Die Syntax für die <Protokollierungsassembly> lautet: - {<Assemblyname>[,<strong name>] | <Assemblydatei>} + {<assembly name>[,<strong name>] | <assembly file>} Die Protokollierungsoptionen geben an, wie MSBuild die Protokollierung erstellt. Die <Protokollierungsparameter> sind optional und werden genau so an die Protokollierung übergeben, wie sie eingegeben wurden. (Kurzform: -l) diff --git a/src/MSBuild/Resources/xlf/Strings.es.xlf b/src/MSBuild/Resources/xlf/Strings.es.xlf index a31a8006280..91a98c70d99 100644 --- a/src/MSBuild/Resources/xlf/Strings.es.xlf +++ b/src/MSBuild/Resources/xlf/Strings.es.xlf @@ -123,7 +123,7 @@ Hace que MSBuild informe de los accesos a los archivos a cualquier complemento de caché de proyectos. -Esta marca es experimental y puede que no funcione según lo previsto. + Esta marca es experimental y puede que no funcione según lo previsto. LOCALIZATION: "-reportFileAccesses" should not be localized. @@ -162,22 +162,22 @@ Esta marca es experimental y puede que no funcione según lo previsto. Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + De acuerdo con la clave del Registro de Windows LongPathsEnabled, la característica LongPaths está {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + deshabilitada enabled - enabled + habilitada not set - not set + sin establecer @@ -598,18 +598,14 @@ Esta marca es experimental y puede que no funcione según lo previsto. -logger:XMLLogger,C:\Loggers\MyLogger.dll;OutputAsHTML -logger:<registrador> Use este registrador para registrar eventos - de MSBuild. Para especificar varios registradores, especifique - cada uno de ellos por separado. + de MSBuild. Para especificar varios registradores, especifique cada uno de ellos por separado. La sintaxis de <registrador> es: - [<clase>,]<ensamblado>[,<opciones>][;<parámetros>] + [<clase>,]<assembly>[,<opciones>][;<parámetros>] La sintaxis de <clase del registrador> es: - [<espacio de nombres parcial o completo>.]<nombre de - clase del registrador> - La sintaxis de <ensamblado del registrador> es: - {<nombre del ensamblado>[,<strong name>] | <archivo - de ensamblado>} - Las opciones del registrador especifican cómo crea MSBuild - el registrador. + [<espacio de nombres parcial o completo>.]<nombre de clase del registrador> + La sintaxis de <ensamblado del registrador> es: + {<assembly name>[,<strong name>] | <assembly file>} + Las opciones del registrador especifican cómo crea MSBuild el registrador. Los <parámetros del registrador> son opcionales y se pasan al registrador tal como se escriben. (Forma corta: -l) Ejemplos: @@ -886,15 +882,12 @@ Esta marca es experimental y puede que no funcione según lo previsto. Para especificar varios registradores, especifique cada uno de ellos por separado. (Forma corta: -dl) La sintaxis de <registrador> es: - [<clase>,]<ensamblado>[,<opciones>][;<parámetros>] + [<clase>,]<assembly>[,<opciones>][;<parámetros>] La sintaxis de <clase del registrador> es: - [<espacio de nombres parcial o completo>.]<nombre - de la clase del registrador> + [<espacio de nombres parcial o completo>.]<nombre de la clase del registrador> La sintaxis de <ensamblado del registrador> es: - {<nombre del ensamblado>[,<strong name>] | <archivo - de ensamblado>} - Las opciones del registrador especifican cómo crea MSBuild - el registrador. + {<assembly name>[,<strong name>] | <assembly file>} + Las opciones del registrador especifican cómo crea MSBuild el registrador. Los <parámetros del registrador> son opcionales y se pasan al registrador tal como se escriben. (Forma corta: -l) Ejemplos: diff --git a/src/MSBuild/Resources/xlf/Strings.fr.xlf b/src/MSBuild/Resources/xlf/Strings.fr.xlf index 15883adffc6..31bd2ef9109 100644 --- a/src/MSBuild/Resources/xlf/Strings.fr.xlf +++ b/src/MSBuild/Resources/xlf/Strings.fr.xlf @@ -121,7 +121,7 @@ -reportFileAccesses[:True|False] Entraîne le signalement par MSBuild des accès par fichiers aux plug-ins - cache de projet configurés. + de cache de projet configurés. Cet indicateur est expérimental et peut ne pas fonctionner comme prévu. @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + D’après la clé de Registre Windows LongPathsEnabled, la fonctionnalité LongPaths est {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + désactivé enabled - enabled + activé not set - not set + non défini @@ -604,7 +604,7 @@ Cet indicateur est expérimental et peut ne pas fonctionner comme prévu. Syntaxe de <classe de journalisation> : [<espace de noms partiels ou complets>.]<nom de la classe de journalisation> Syntaxe de <assembly de journalisation> : - {<nom d'assembly>[,<strong name>] | <fichier d'assembly>} + {<assembly name>[,<strong name>] | <assembly file>} Les options de journalisation spécifient la façon dont MSBuild crée le journaliseur. Les <paramètres de journalisation> sont facultatifs. Ils sont passés au journaliseur tels que vous les avez tapés. (Forme abrégée : -l) @@ -886,7 +886,7 @@ Remarque : verbosité des enregistreurs d’événements de fichiers Syntaxe de <classe de journalisation> : [<espace de noms partiels ou complets>.]<nom de la classe de journalisation> Syntaxe de <assembly de journalisation> : - {<nom d'assembly>[,<strong name>] | <fichier d'assembly>} + {<assembly name>[,<strong name>] | <assembly file>} Les options de journalisation spécifient la façon dont MSBuild crée le journaliseur. Les <paramètres de journalisation> sont facultatifs. Ils sont passés au journaliseur tels que vous les avez tapés. (Forme abrégée : -l) @@ -1359,7 +1359,7 @@ Remarque : verbosité des enregistreurs d’événements de fichiers MSBUILD : error MSB1014: Must provide an item name for the getItem switch. - MSBUILD : error MSB1014: Must provide an item name for the getItem switch. + MSBUILD : error MSB1014: Doit fournir un nom d'élément pour le commutateur getItem. {StrBegin="MSBUILD : error MSB1014: "}UE: This happens if the user does something like "msbuild.exe -getItem". The user must pass in an actual item name following the switch, as in "msbuild.exe -getItem:blah". @@ -1368,7 +1368,7 @@ Remarque : verbosité des enregistreurs d’événements de fichiers MSBUILD : error MSB1010: Must provide a property name for the getProperty switch. - MSBUILD : error MSB1010: Must provide a property name for the getProperty switch. + MSBUILD : error MSB1010: Doit fournir un nom de propriété pour le commutateur getProperty. {StrBegin="MSBUILD : error MSB1010: "}UE: This happens if the user does something like "msbuild.exe -getProperty". The user must pass in an actual property name following the switch, as in "msbuild.exe -getProperty:blah". @@ -1386,7 +1386,7 @@ Remarque : verbosité des enregistreurs d’événements de fichiers MSBUILD : error MSB1017: Must provide a target name for the getTargetResult switch. - MSBUILD : error MSB1017: Must provide a target name for the getTargetResult switch. + MSBUILD : error MSB1017: Doit fournir un nom de cible pour le commutateur getTargetResult. {StrBegin="MSBUILD : error MSB1017: "}UE: This happens if the user does something like "msbuild.exe -getTargetResult". The user must pass in an actual target name following the switch, as in "msbuild.exe -getTargetResult:blah". @@ -1651,7 +1651,7 @@ Remarque : verbosité des enregistreurs d’événements de fichiers MSBUILD : error MSB1063: Cannot access properties or items when building solution files or solution filter files. This feature is only available when building individual projects. - MSBUILD : error MSB1063: Cannot access properties or items when building solution files or solution filter files. This feature is only available when building individual projects. + MSBUILD : error MSB1063: Impossible d'accéder aux propriétés ou aux éléments lors de la création de fichiers de solution ou de fichiers de filtre de solution. Cette fonctionnalité est disponible uniquement lors de la génération de projets individuels. {StrBegin="MSBUILD : error MSB1063: "}UE: This happens if the user passes in a solution file when trying to access individual properties or items. The user must pass in a project file. LOCALIZATION: The prefix "MSBUILD : error MSBxxxx:" should not be localized. diff --git a/src/MSBuild/Resources/xlf/Strings.it.xlf b/src/MSBuild/Resources/xlf/Strings.it.xlf index 8563e1864c8..3627e11c42d 100644 --- a/src/MSBuild/Resources/xlf/Strings.it.xlf +++ b/src/MSBuild/Resources/xlf/Strings.it.xlf @@ -120,10 +120,10 @@ This flag is experimental and may not work as intended. -reportFileAccesses[:True|False] - Fa in modo che MSBuild segnali gli accessi ai file a qualsiasi file configurato + Fa in modo che MSBuild segnali gli accessi ai file a qualsiasi plug-in della cache del progetto. -Questo flag è sperimentale e potrebbe non funzionare come previsto. + Questo flag è sperimentale e potrebbe non funzionare come previsto. LOCALIZATION: "-reportFileAccesses" should not be localized. @@ -162,22 +162,22 @@ Questo flag è sperimentale e potrebbe non funzionare come previsto. Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + In base alla chiave del Registro di sistema di Windows LongPathsEnabled, la funzionalità LongPaths è {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + disabilitata enabled - enabled + abilitata not set - not set + non impostata @@ -610,8 +610,8 @@ Questo flag è sperimentale e potrebbe non funzionare come previsto. [<classe>,]<assembly>[,<opzioni>][;<parametri>] La sintassi di <classe logger> è la seguente: [<spazio dei nomi parziale o completo>.]<nome classe logger> - La sintassi di <assembly logger> è la seguente: - {<nome assembly>[,<strong name>] | <file di assembly>} + La sintassi di <logger assembly> è la seguente: + {<assembly name>[,<strong name>] | <assembly file>} Le opzioni di logger consentono di specificare in che modo MSBuild crea il logger. I <parametri logger> sono facoltativi e vengono passati al logger così come vengono digitati. Forma breve: -l. @@ -892,8 +892,8 @@ Nota: livello di dettaglio dei logger di file [<classe>,]<assembly>[,<opzioni>][;<parametri>] La sintassi di <classe logger> è la seguente: [<spazio dei nomi parziale o completo>.]<nome classe logger> - La sintassi di <assembly logger> è la seguente: - {<nome assembly>[,<strong name>] | <file di assembly>} + La sintassi di <logger assembly> è la seguente: + {<assembly name>[,<strong name>] | <assembly file>} Le opzioni di logger consentono di specificare in che modo MSBuild crea il logger. I <parametri logger> sono facoltativi e vengono passati al logger così come vengono digitati. Forma breve: -l @@ -1012,9 +1012,8 @@ Nota: livello di dettaglio dei logger di file è la directory corrente. Per impostazione predefinita, ai file viene assegnato il nome "MSBuild<idnodo>.log". Il percorso dei file e altri parametri di fileLogger possono - essere specificati aggiungendo l'opzione + essere specificati aggiungendo l'opzione "-fileLoggerParameters". - "-fileLoggerParameters". Se il nome di un file di log viene impostato con l'opzione fileLoggerParameters, il logger distribuito userà il nome file come modello e aggiungerà l'ID del nodo per creare un @@ -1361,7 +1360,7 @@ Nota: livello di dettaglio dei logger di file MSBUILD : error MSB1067: Must provide a feature name for the featureavailability switch. - MSBUILD : error MSB1067: È necessario fornire un nome funzionalità per il passaggio a disponibilità funzionalità. + MSBUILD : error MSB1067: è necessario fornire un nome funzionalità per il passaggio a disponibilità di funzionalità. {StrBegin="MSBUILD : error MSB1067: "}UE: This happens if the user does something like "msbuild.exe -featureavailability". The user must pass in an actual feature name following the switch, as in "msbuild.exe -featureavailability:blah". @@ -2128,16 +2127,15 @@ Esegue la profilatura della valutazione di MSBuild e scrive -restoreProperty:IsRestore=true;MyProperty=value -restoreProperty:<n>=<v> - Imposta queste proprietà a livello di progetto o ne esegue - l'override solo durante il ripristino e non usa le - proprietà specificate con l'argomento -property. - <v> rappresenta il nome della proprietà e <v> il - valore della proprietà. Usare il punto e virgola o la - virgola per delimitare più proprietà o specificare ogni - proprietà separatamente. - Forma breve: -rp. - Esempio: - -restoreProperty:IsRestore=true;MyProperty=value + Imposta queste proprietà a livello di progetto o ne esegue + l'override solo durante il ripristino e non usa le + proprietà specificate con l'argomento -property. + <v> rappresenta il nome della proprietà e <v> il + valore della proprietà. Usare il punto e virgola o la + virgola per delimitare più proprietà o specificare ogni proprietà separatamente. + (Forma breve: -rp) + Esempio: + -restoreProperty:IsRestore=true;MyProperty=value LOCALIZATION: "-restoreProperty" and "-rp" should not be localized. diff --git a/src/MSBuild/Resources/xlf/Strings.ja.xlf b/src/MSBuild/Resources/xlf/Strings.ja.xlf index 507c861bb97..798205dd229 100644 --- a/src/MSBuild/Resources/xlf/Strings.ja.xlf +++ b/src/MSBuild/Resources/xlf/Strings.ja.xlf @@ -121,7 +121,7 @@ -reportFileAccesses[:True|False] MSBuild が、構成されているプロジェクト キャッシュ プラグインへの - ファイル アクセスを報告します。 + ファイル アクセスを報告するようにします。 このフラグは実験的なものであり、意図したとおりに動作しない可能性があります。 @@ -142,7 +142,7 @@ MSBUILD : error MSB1065: Terminal logger value is not valid. It should be one of 'auto', 'true', or 'false'. {0} - MSBUILD : error MSB1065: ターミナル ロガーの値が無効です。'auto'、'true'、または 'false' のいずれかである必要があります。 {0} + MSBUILD : error MSB1065: ターミナル ロガーの値が無効です。'auto'、'true'、または 'false' のいずれかである必要があります。{0} {StrBegin="MSBUILD : error MSB1065: "} UE: This message does not need in-line parameters because the exception takes care of displaying the invalid arg. @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Windows レジストリ キー LongPathsEnabled に基づいて、LongPaths 機能は{0}です。 "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + 無効 enabled - enabled + 有効 not set - not set + 未設定 diff --git a/src/MSBuild/Resources/xlf/Strings.ko.xlf b/src/MSBuild/Resources/xlf/Strings.ko.xlf index 7a6d0d02cc4..8785213435e 100644 --- a/src/MSBuild/Resources/xlf/Strings.ko.xlf +++ b/src/MSBuild/Resources/xlf/Strings.ko.xlf @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Windows 레지스트리 키 LongPathsEnabled에 따라 LongPaths 기능이 {0}입니다. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + 사용 안 함 enabled - enabled + 사용 not set - not set + 설정 안 함 @@ -600,11 +600,11 @@ -logger:<로거> 이 로거를 사용하여 MSBuild의 이벤트를 기록합니다. 여러 로거를 지정하려면 각 로거를 개별적으로 지정합니다. <로거> 구문은 다음과 같습니다. - [<클래스>,]<어셈블리>[,<옵션>][;<매개 변수>] + [<클래스>,]<assembly>[,<옵션>][;<매개 변수>] <로거 클래스> 구문은 다음과 같습니다. [<부분 또는 전체 네임스페이스>.]<로거 클래스 이름> <로거 어셈블리> 구문은 다음과 같습니다. - {<어셈블리 이름>[,<strong name>] | <어셈블리 파일>} + {<assembly name>[,<strong name>] | <assembly file>} 로거 옵션은 MSBuild가 로거를 만드는 방법을 지정합니다. <로거 매개 변수>는 선택 사항이고 입력한 대로 정확히 로거에 전달됩니다. (약식: -l) @@ -882,11 +882,11 @@ 로거를 지정하려면 각 로거를 개별적으로 지정합니다. (약식 -dl) <로거> 구문은 다음과 같습니다. - [<클래스>,]<어셈블리>[,<옵션>][;<매개 변수>] + [<클래스>,]<assembly>[,<옵션>][;<매개 변수>] <로거 클래스> 구문은 다음과 같습니다. [<부분 또는 전체 네임스페이스>.]<로거 클래스 이름> <로거 어셈블리> 구문은 다음과 같습니다. - {<어셈블리 이름>[,<strong name>] | <어셈블리 파일>} + {<assembly name>[,<strong name>] | <assembly file>} 로거 옵션은 MSBuild가 로거를 만드는 방법을 지정합니다. <로거 매개 변수>는 선택 사항이고 입력한 대로 정확히 로거에 전달됩니다. (약식: -l) diff --git a/src/MSBuild/Resources/xlf/Strings.pl.xlf b/src/MSBuild/Resources/xlf/Strings.pl.xlf index f51befa72f5..c9e53ce52f0 100644 --- a/src/MSBuild/Resources/xlf/Strings.pl.xlf +++ b/src/MSBuild/Resources/xlf/Strings.pl.xlf @@ -120,10 +120,10 @@ This flag is experimental and may not work as intended. -reportFileAccesses[:True|False] - Powoduje, że program MSBuild zgłasza dostępy do wszystkich skonfigurowanych plików + Powoduje, że platforma MSBuild zgłasza dostępy do wszystkich skonfigurowanych wtyczek pamięci podręcznej projektu. -Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. + Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. LOCALIZATION: "-reportFileAccesses" should not be localized. @@ -162,22 +162,22 @@ Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Na podstawie klucza rejestru systemu Windows LongPathsEnabled funkcja LongPaths jest {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + wyłączono enabled - enabled + włączono not set - not set + nie ustawiono @@ -602,17 +602,14 @@ Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. -logger:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral -logger:XMLLogger,C:\Loggers\MyLogger.dll;OutputAsHTML - -logger:<rejestrator> Umożliwia użycie podanego rejestratora do rejestrowania - zdarzeń pochodzących z programu MSBuild. Aby określić - wiele rejestratorów, określ każdy z nich osobno. + -logger:<rejestrator> Umożliwia użycie podanego rejestratora do rejestrowania zdarzeń pochodzących + z programu MSBuild. Aby określić wiele rejestratorów, określ każdy z nich osobno. Składnia elementu <rejestrator>: - [<klasa rejestratora>,]<zestaw rejestratora> - [;<parametry rejestratora>] + [<klasa rejestratora>,]<assembly> [;<parametry rejestratora>] Składnia elementu <klasa rejestratora>: - [<częściowa lub pełna przestrzeń nazw>.] - <nazwa klasy rejestratora> + [<częściowa lub pełna przestrzeń nazw>.] <nazwa klasy rejestratora> Składnia elementu <zestaw rejestratora>: - {<nazwa zestawu>[,<strong name>] | <plik zestawu>} + {<assembly name>[,<strong name>] | <assembly file>} Wartości <parametry rejestratora> są opcjonalne i są przekazywane do rejestratora dokładnie tak, jak zostały wpisane. (Krótka wersja: -l) @@ -891,11 +888,11 @@ Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. wiele rejestratorów, określ każdy z nich osobno. (Krótka wersja: -dl) Składnia elementu <rejestrator>: - [<klasa rejestratora>,]<zestaw rejestratora>[;<parametry rejestratora>] + [<klasa rejestratora>,]<assembly>[;<parametry rejestratora>] Składnia elementu <klasa rejestratora>: [<częściowa lub pełna przestrzeń nazw>.]<nazwa klasy rejestratora> Składnia elementu <zestaw rejestratora>: - {<nazwa zestawu>[,<strong name>] | <plik zestawu>} + {<assembly name>[,<strong name>] | <assembly file>} Wartości <parametry rejestratora> są opcjonalne i są przekazywane do rejestratora dokładnie tak, jak zostały wpisane. (Krótka wersja: -l) @@ -1007,13 +1004,11 @@ Ta flaga jest eksperymentalna i może nie działać zgodnie z oczekiwaniami. create a log file for each node. -distributedFileLogger - Rejestruje dane wyjściowe kompilacji w wielu plikach - dziennika, po jednym pliku na węzeł programu MSBuild. - Początkową lokalizacją tych plików jest bieżący katalog. - Domyślnie pliki mają nazwę + Rejestruje dane wyjściowe kompilacji w wielu plikach dziennika,po jednym pliku + na węzeł programu MSBuild. Początkową lokalizacją tych plików + jest bieżący katalog. Domyślnie pliki mają nazwę „MSBuild<identyfikator węzła>.log”. Lokalizację plików i inne parametry rejestratora plików można określić - przez dodanie przełącznika „-fileLoggerParameters”. Jeśli nazwa pliku zostanie ustawiona za pomocą przełącznika diff --git a/src/MSBuild/Resources/xlf/Strings.pt-BR.xlf b/src/MSBuild/Resources/xlf/Strings.pt-BR.xlf index aa4fbc6c949..1d4c6e463f2 100644 --- a/src/MSBuild/Resources/xlf/Strings.pt-BR.xlf +++ b/src/MSBuild/Resources/xlf/Strings.pt-BR.xlf @@ -120,8 +120,9 @@ This flag is experimental and may not work as intended. -reportFileAccesses[:True|False] - Faz com que o MSBuild relate acessos a arquivos para qualquer plug-in - de cache de projeto configurado. + Faz com que o MSBuild relate acessos a arquivos a qualquer + configurado + plug-ins de cache do projeto. Este sinalizador é experimental e pode não funcionar conforme o esperado. @@ -162,22 +163,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Com base na chave do Registro do Windows LongPathsEnabled, o recurso LongPaths é {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + desabilitado enabled - enabled + habilitado not set - not set + não definido diff --git a/src/MSBuild/Resources/xlf/Strings.ru.xlf b/src/MSBuild/Resources/xlf/Strings.ru.xlf index cae465db562..cef6876ff61 100644 --- a/src/MSBuild/Resources/xlf/Strings.ru.xlf +++ b/src/MSBuild/Resources/xlf/Strings.ru.xlf @@ -86,7 +86,7 @@ ({0:F1}s) - ({0:F1}s) + ({0:F1}с) {0}: duration in seconds with 1 decimal point @@ -142,7 +142,7 @@ MSBUILD : error MSB1065: Terminal logger value is not valid. It should be one of 'auto', 'true', or 'false'. {0} - MSBUILD : error MSB1065: Terminal logger value is not valid. It should be one of 'auto', 'true', or 'false'. {0} + MSBUILD : error MSB1065: Недопустимое значение средства ведения журнала терминала. Это должно быть одно из следующих значений: "auto", "ИСТИНА" или "ЛОЖЬ". {0} {StrBegin="MSBUILD : error MSB1065: "} UE: This message does not need in-line parameters because the exception takes care of displaying the invalid arg. @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + На основе раздела реестра Windows LongPathsEnabled функция LongPaths имеет значение {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + отключено enabled - enabled + включено not set - not set + не задано @@ -1376,7 +1376,7 @@ MSBUILD : error MSB1068: Must provide a file for the getResultOutputFile switch. - MSBUILD : error MSB1068: необходимо указать файл для параметра getResultOutputFile. + MSBUILD : error MSB1068: необходимо предоставить файл для переключателя getResultOutputFile. {StrBegin="MSBUILD : error MSB1068: "}UE: This happens if the user does something like "msbuild.exe -getResultOutputFile". The user must pass in an actual file following the switch, as in "msbuild.exe -getTargetResult:blah -getResultOutputFile:blah.txt". diff --git a/src/MSBuild/Resources/xlf/Strings.tr.xlf b/src/MSBuild/Resources/xlf/Strings.tr.xlf index d74d39651ba..75b1939ea3d 100644 --- a/src/MSBuild/Resources/xlf/Strings.tr.xlf +++ b/src/MSBuild/Resources/xlf/Strings.tr.xlf @@ -86,7 +86,7 @@ ({0:F1}s) - ({0:F1}s) + ({0:F1} sn) {0}: duration in seconds with 1 decimal point @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + Windows kayıt defteri anahtarı LongPathsEnabled ayarına bağlı olarak LongPaths özelliği {0}. "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + devre dışı enabled - enabled + etkin not set - not set + ayarlanmadı @@ -600,13 +600,13 @@ -logger:<günlükçü> MSBuild'deki olayları günlüğe almak için bu günlükçüyü kullanın. Birden fazla günlükçü belirtmek için her günlükçüyü ayrı ayrı belirtin. <günlükçü> söz dizimi şöyledir: - [<sınıf>,]<derleme>[,<seçenekler>][;<parametreler>] + [<class>,]<assembly>[,<options>][;<parameters>] <günlükçü sınıfı > söz dizimi şöyledir: [<kısmi veya tam ad alanı >.]<günlükçü sınıfı adı> <günlükçü derlemesi> söz dizimi şöyledir: - {<derleme adı>[,<strong name>] | <derleme dosyası>} + {<assembly name>[,<strong name>] | <assembly file>} Günlükçü seçenekleri, MSBuild'in günlükçüyü oluşturma biçimini belirtir. - <günlükçü parametreleri > isteğe bağlıdır ve tam olarak + <günlükçü parametreleri > isteğe bağlıdır ve tam olarak yazdığınız şekliyle günlükçüye geçirilir. (Kısa biçim: -l) Örnekler: -logger:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral @@ -882,11 +882,11 @@ günlükçü belirtmek için her günlükçüyü ayrı ayrı belirtin. (Kısa biçim -dl) <günlükçü> söz dizimi şöyledir: - [<sınıf>,]<derleme>[,<seçenekler>][;<parametreler>] + [<sınıf>,]<assembly>[,<seçenekler>][;<parametreler>] <günlükçü sınıfı> söz dizimi şöyledir: [<kısmi veya tam ad alanı>.]<günlükçü sınıfı adı> <günlükçü derlemesi> söz dizimi şöyledir: - {<derleme adı>[,<strong name>] | <derleme dosyası>} + {<assembly name>[,<strong name>] | <assembly file>} Günlükçü seçenekleri, MSBuild'in günlükçüyü oluşturma biçimini belirtir. <günlükçü parametreleri> isteğe bağlıdır ve tam olarak yazdığınız şekliyle günlükçüye geçirilir. (Kısa biçim: -l) @@ -913,10 +913,9 @@ -ignoreProjectExtensions:.sln -ignoreProjectExtensions:<uzantılar> - Hangi proje dosyasının oluşturulacağı belirlenirken - yoksayılacak uzantıların listesi. Birden çok uzantıyı - birbirinden ayırmak için noktalı virgül veya - virgül kullanın. + Hangi proje dosyasının oluşturulacağı belirlenirken + yoksayılacak uzantıların listesi. Birden çok uzantıyı + birbirinden ayırmak için noktalı virgül veya virgül kullanın. (Kısa biçim: -ignore) Örnek: -ignoreProjectExtensions:.sln @@ -1006,7 +1005,6 @@ Dosyaların konumu ve fileLogger'ın diğer parametreleri "/fileLoggerParameters" anahtarının eklenmesi yoluyla belirtilebilir. - Günlük dosyası adı fileLoggerParameters anahtarı aracılığıyla ayarlanırsa dağıtılmış günlükçü fileName değerini şablon olarak kullanıp her düğümün günlük dosyasını @@ -1053,32 +1051,31 @@ -fileLoggerParameters[n]:<parametreler> Dosya günlükçüleri için ek parametreler sağlar. - Bu anahtarın olması karşılık gelen -fileLogger[n] + Bu anahtarın olması karşılık gelen -fileLogger[n] anahtarının olduğu anlamına gelir. "n" varsa, 1-9 arasında bir rakam olabilir. - Dağıtılmış dosya günlükçüleri varsa -fileLoggerParameters - bunlar tarafından da kullanılır; -distributedFileLogger - açıklamasına bakın. + Dağıtılmış dosya günlükçüleri varsa -fileLoggerParameters + bunlar tarafından da kullanılır; -distributedFileLogger açıklamasına bakın. (Kısa biçim: -flp[n]) - Konsol günlükçüsü için listelenenlerle aynı parametreler + Konsol günlükçüsü için listelenenlerle aynı parametreler kullanılabilir. Kullanılabilecek bazı ek parametreler: - LogFile--Oluşturma günlüğünün yazılacağı günlük + LogFile--Oluşturma günlüğünün yazılacağı günlük dosyasının yolu. - Append--Derleme günlüğünün gün dosyasının sonuna mı - ekleneceğini yoksa üzerine mi yazılacağını - belirler. Anahtar ayarlandığında oluşturma günlüğü - dosyanın sonuna eklenir. Anahtar ayarlanmadığında - varolan günlük dosyasının üzerine yazılır. + Append--Derleme günlüğünün gün dosyasının sonuna mı + ekleneceğini yoksa üzerine mi yazılacağını + belirler. Anahtar ayarlandığında oluşturma günlüğü + dosyanın sonuna eklenir. Anahtar ayarlanmadığında + varolan günlük dosyasının üzerine yazılır. Varsayılan: günlük dosyasının sonuna eklenmez. - Encoding--Dosyanın kodlamasını belirtir; örneğin, + Encoding--Dosyanın kodlamasını belirtir; örneğin, UTF-8, Unicode veya ASCII Varsayılan ayrıntı düzeyi ayarı Detailed'dır. Örnekler: -fileLoggerParameters:LogFile=MyLog.log;Append; Verbosity=diagnostic;Encoding=UTF-8 - -flp:Summary;Verbosity=minimal;LogFile=msbuild.sum - -flp1:warningsonly;logfile=msbuild.wrn + -flp:Summary;Verbosity=minimal;LogFile=msbuild.sum + -flp1:warningsonly;logfile=msbuild.wrn -flp2:errorsonly;logfile=msbuild.err @@ -1102,8 +1099,7 @@ -nr:true -nodeReuse:<parametreler> - MSBuild düğümlerinin yeniden kullanımını etkinleştirir - veya devre dışı bırakır. + MSBuild düğümlerinin yeniden kullanımını etkinleştirir veya devre dışı bırakır. Parametreler: True --Derleme tamamlandıktan sonra düğümler kalır ve izleyen derlemelerde yeniden kullanılır (varsayılan) @@ -1452,7 +1448,7 @@ MSBUILD : error MSB1066: Specify one or more parameters for the terminal logger if using the -terminalLoggerParameters switch - MSBUILD : error MSB1066: -terminalLoggerParameters anahtarı kullanılıyorsa terminal günlükçüsü için bir veya birden çok parametre belirtin + MSBUILD : error MSB1066: terminalLoggerParameters anahtarı kullanılıyorsa terminal günlükçüsü için bir veya birden çok parametre belirtin {StrBegin="MSBUILD : error MSB1066: "} UE: This happens if the user does something like "msbuild.exe -termionalLoggerParameters:". The user must pass in one or more parameters diff --git a/src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf b/src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf index 74973d7b85a..2166e495b55 100644 --- a/src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf @@ -17,7 +17,7 @@ Build {0} in {1}s - 在 {1} 秒内生成 {0} + 在 {1} 中生成 {0} Overall build summary {0}: BuildResult_X (below) @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + 基于 Windows 注册表项 LongPathsEnabled，LongPaths 功能为 {0}。 "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + 已禁用 enabled - enabled + 已启用 not set - not set + 未设置 @@ -1530,7 +1530,7 @@ {0}{1} {2} ({3}s) - {0}{1} {2} ({3} 秒) + {0}{1} {2} ({3}) Project finished summary. {0}: indentation - few spaces to visually indent row @@ -1608,14 +1608,14 @@ Restore complete ({0}s) - 还原完成({0} 秒) + 还原完成({0}) {0}: duration in seconds with 1 decimal point Restore {0} in {1}s - 在 {1} 秒内还原 {0} + 在 {1} 中还原 {0} Restore summary when finished with warning or error {0}: BuildResult_X (below) diff --git a/src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf b/src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf index 7f159572f6e..e45b4bf5d9c 100644 --- a/src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf @@ -162,22 +162,22 @@ Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. - Based on the Windows registry key LongPathsEnabled, the LongPaths feature is {0}. + 根據 Windows 登錄機碼 LongPathsEnabled，LongPaths 功能為 {0}。 "Windows" is the OS, "LongPathsEnabled" should not be localized, and {0} will be "enabled"/"disabled"/"not set" disabled - disabled + 已停用 enabled - enabled + 已啟用 not set - not set + 未設定 @@ -600,11 +600,11 @@ -logger:<記錄器> 使用此記錄器可記錄 MSBuild 的事件。 若要指定多個記錄器，請各別指定每個記錄器。 <記錄器> 語法為: - [<類別>,]<組件>[,<選項>][;<參數>] + [<class>,]<assembly>[,<options>][;<parameters>] <記錄器類別> 語法為: [<一部分或完整的命名空間>.]<記錄器類別名稱> <記錄器組件> 語法為: - {<組件名稱>[,<strong name>] | <組件檔案>} + {<assembly name>[,<strong name>] | <assembly file>} 記錄器選項會指定 MSBuild 建立記錄器的方式。 <記錄器參數> 是選擇性參數，其會依您輸入的內容， 完全一樣地傳遞到記錄器。(簡短形式: -l) @@ -882,11 +882,11 @@ 若要指定多個記錄器，請各別指定每個記錄器。 (簡短形式 -dl) <記錄器> 語法為: - [<類別>,]<組件>[,<選項>][;<參數>] + [<class>,]<assembly>[,<options>][;<parameters>] <記錄器類別> 語法為: [<一部分或完整的命名空間>.]<記錄器類別名稱> <記錄器組件> 語法為: - {<組件名稱>[,<strong name>] | <組件檔案>} + {<assembly name>[,<strong name>] | <assembly file>} 記錄器選項會指定 MSBuild 建立記錄器的方式。 <記錄器參數> 是選擇性參數，其會依您輸入的內容， 完全一樣地傳遞到記錄器。(簡短形式: -l) diff --git a/src/Shared/Resources/xlf/Strings.shared.cs.xlf b/src/Shared/Resources/xlf/Strings.shared.cs.xlf index b8eb609791a..adcdc9b419a 100644 --- a/src/Shared/Resources/xlf/Strings.shared.cs.xlf +++ b/src/Shared/Resources/xlf/Strings.shared.cs.xlf @@ -325,7 +325,7 @@ MSB5029: The value "{0}" of the "{1}" attribute in element <{2}> in file "{3}" is a wildcard that results in enumerating all files on the drive, which was likely not intended. Check that referenced properties are always defined and that the project and current working directory are not at the drive root. - MSB5029: Hodnota {0} atributu {1} v elementu <{2}> v souboru {3}je zástupný znak, jehož výsledkem je výčet všech souborů na jednotce, což pravděpodobně nebylo zamýšleno. Zkontrolujte, zda jsou odkazované vlastnosti vždy definovány a zda projekt a aktuální pracovní adresář nejsou v kořenovém adresáři jednotky. + MSB5029: Hodnota {0} atributu {1} v elementu <{2}> v souboru {3} je zástupný znak, jehož výsledkem je výčet všech souborů na jednotce, což pravděpodobně nebylo zamýšleno. Zkontrolujte, zda jsou odkazované vlastnosti vždy definovány a zda projekt a aktuální pracovní adresář nejsou v kořenovém adresáři jednotky. {StrBegin="MSB5029: "}UE: This is a generic message that is displayed when we find a project element that has a drive enumerating wildcard value for one of its attributes e.g. <Compile Include="$(NotAlwaysDefined)\**\*.cs"> -- if the property is undefined, the value of Include should not result in enumerating all files on drive. diff --git a/src/Tasks/Resources/xlf/Strings.es.xlf b/src/Tasks/Resources/xlf/Strings.es.xlf index 1348e2c1844..f7a472537e9 100644 --- a/src/Tasks/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Resources/xlf/Strings.es.xlf @@ -128,7 +128,7 @@ MSB3654: Delay signing requires that at least a public key be specified. Please either supply a public key using the KeyFile or KeyContainer properties, or disable delay signing. - MSB3654: La firma retardada requiere que se especifique al menos una clave pública. Proporcione una clave pública mediante las propiedades KeyFile o KeyContainer, o deshabilite la firma retardada. + MSB3654: La firma retrasada requiere que se especifique al menos una clave pública. Proporcione una clave pública mediante las propiedades KeyFile o KeyContainer, o deshabilite la firma retrasada. {StrBegin="MSB3654: "} @@ -358,7 +358,7 @@ MSB3061: Unable to delete file "{0}". {1} {2} - MSB3061: No se puede eliminar el archivo "{0}". {1} {2} + MSB3061: no se puede eliminar el archivo "{0}". {1} {2} {StrBegin="MSB3061: "} @@ -373,7 +373,7 @@ MSB3062: Could not delete file "{0}". Beginning retry {1} in {2}ms. {3} {4} - MSB3062: No se pudo eliminar el archivo "{0}". Iniciando reintento{1} en {2}ms. {3} {4} + MSB3062: no se pudo eliminar el archivo "{0}". Iniciando el reintento {1} en {2} ms. {3} {4} {StrBegin="MSB3062: "} LOCALIZATION: {0} are paths. {1} and {2} are numbers. {3} is an optional localized message, {4} is message from LockCheck. @@ -1520,7 +1520,7 @@ MSB3677: Unable to move file "{0}" to "{1}". {2} {3} - MSB3677: No se puede mover el archivo "{0}" a "{1}". {2} {3} + MSB3677: no es posible mover el archivo "{0}" a "{1}". {2} {3} {StrBegin="MSB3677: "} @@ -2352,7 +2352,7 @@ MSB3295: Failed to load an assembly. Please make sure you have disabled strong name verification for your public key if you want to generate delay signed wrappers. {0} - MSB3295: No se pudo cargar un ensamblado. Asegúrese de que deshabilitó la comprobación de nombres seguros para su clave pública si desea generar contenedores de firma retardada. {0} + MSB3295: No se pudo cargar un ensamblado. Asegúrese de que deshabilitó la comprobación de nombres seguros para su clave pública si desea generar contenedores de firma con retraso. {0} {StrBegin="MSB3295: "} @@ -2561,7 +2561,7 @@ MSB3353: Public key necessary for delay signing was not specified. - MSB3353: No se especificó la clave pública necesaria para la firma retardada. + MSB3353: No se especificó la clave pública necesaria para la firma con retraso. {StrBegin="MSB3353: "} @@ -2586,7 +2586,7 @@ MSB3372: The file "{0}" cannot be made writable. {1} {2} - MSB3372: El archivo "{0}" no se puede escribir. {1} {2} + MSB3372: el archivo "{0}" no se puede hacer grabable. {1} {2} {StrBegin="MSB3372: "} @@ -2596,7 +2596,7 @@ MSB3374: The last access/last write time on file "{0}" cannot be set. {1} {2} - MSB3374: No se puede establecer la hora de último acceso o última escritura en el archivo "{0}". {1} {2} + MSB3374: no se puede establecer la hora de último acceso o última escritura en el archivo "{0}". {1} {2} {StrBegin="MSB3374: "} @@ -2691,7 +2691,7 @@ MSB3935: Failed to unzip file "{0}" because destination file "{1}" is read-only and could not be made writable. {2} {3} - MSB3935: No se pudo descomprimir el archivo "{0}" porque el archivo de destino "{1}" es de solo lectura y no se pudo escribir. {2} {3} + MSB3935: no se pudo descomprimir el archivo "{0}" porque el archivo de destino "{1}" es de solo lectura y no se pudo hacer grabable. {2} {3} {StrBegin="MSB3935: "} @@ -2776,7 +2776,7 @@ MSB3491: Could not write lines to file "{0}". {1} {2} - MSB3491: No se pudieron escribir líneas en el archivo "{0}". {1} {2} + MSB3491: no se pudieron escribir líneas en el archivo "{0}". {1} {2} {StrBegin="MSB3491: "} @@ -3046,7 +3046,7 @@ MSB3713: The file "{0}" could not be created. {1} {2} - MSB3713: No se pudo crear el archivo "{0}". {1} {2} + MSB3713: no se pudo crear el archivo "{0}". {1} {2} {StrBegin="MSB3713: "} @@ -3496,7 +3496,7 @@ MSB3943: Failed to zip directory "{0}" to file "{1}". {2} {3} - MSB3943: No se pudo comprimir el directorio "{0}" en el archivo "{1}". {2} {3} + MSB3943: no se pudo comprimir el directorio "{0}" en el archivo "{1}". {2} {3} {StrBegin="MSB3943: "} diff --git a/src/Tasks/Resources/xlf/Strings.it.xlf b/src/Tasks/Resources/xlf/Strings.it.xlf index 12c155599d8..16347d2a11f 100644 --- a/src/Tasks/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Resources/xlf/Strings.it.xlf @@ -133,12 +133,12 @@ MSB3991: '{0}' is not set or empty. When {1} is false, make sure to set a non-empty value for '{0}'. - MSB3991: '{0}' non è impostato o è vuoto. Quando {1} è false, assicurarsi di impostare un valore non vuoto per '{0}'. + MSB3991: “{0}” non è impostato o è vuoto. Quando {1} è false, assicurarsi di impostare un valore non vuoto per "{0}". {StrBegin="MSB3991: "} MSB3992: '{0}' is not set. When {1} is true, make sure to set a value for '{0}'. - MSB3992: '{0}' non è impostato. Quando {1} è true, assicurarsi di impostare un valore per '{0}'. + MSB3992: "{0}" non impostato. Quando {1} è true, assicurarsi di impostare un valore per "{0}". {StrBegin="MSB3992: "} From bcaf46650252904b4f4af8fbe0541ee7d55e85ca Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Fri, 6 Sep 2024 09:50:04 +0200 Subject: [PATCH 02/10] [17.11] Fix component governance alerts (#10520) * Resolves CG alerts --------- Co-authored-by: Rainer Sigwald --- eng/Packages.props | 1 + eng/SourceBuildPrebuiltBaseline.xml | 1 + eng/Version.Details.xml | 4 ++++ eng/Versions.props | 3 ++- src/MSBuild/app.amd64.config | 2 +- src/MSBuild/app.config | 4 ++++ 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props index 6f4d99b91a9..e9c77ff48f9 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -19,6 +19,7 @@ + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 477458641a0..187a4bad2e3 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc70b9181e1..a55be9b7fc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,6 +65,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2aade6beb02ea367fd97c4070a4198802fe61c03 + diff --git a/eng/Versions.props b/eng/Versions.props index 08c714dae44..87614144eac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.5release + 17.11.6release 17.10.4 15.1.0.0 preview @@ -41,6 +41,7 @@ 8.0.3 8.0.0 8.0.0 + 8.0.1 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 38ae4cbb8d4..64cbc9fd927 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -49,7 +49,7 @@ - + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 6fc1459176b..ed1d08d1882 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -43,6 +43,10 @@ + + + + From 829da3b4c4e81f4cc6035610bd8da4e0af1e2649 Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Mon, 9 Sep 2024 07:49:29 +0200 Subject: [PATCH 03/10] Assembly redirect fix (#10624) * Fixing the assembly redirect --- eng/Versions.props | 2 +- src/MSBuild/app.amd64.config | 2 +- src/MSBuild/app.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 87614144eac..8d86f6eb54f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.6release + 17.11.7release 17.10.4 15.1.0.0 preview diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 64cbc9fd927..906e99877e8 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -49,7 +49,7 @@ - + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index ed1d08d1882..be398bb72d4 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -45,7 +45,7 @@ - + From 9021c54be72b564075cb4ed0998537da18390d9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:07:59 +0000 Subject: [PATCH 04/10] [vs17.11] Update dependencies from dotnet/arcade (#10654) * Update dependencies from https://github.com/dotnet/arcade build 20240910.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4 * version bump --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Mariana Garces Dematte --- NuGet.config | 21 ++++++++- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 5 ++- eng/common/post-build/publish-using-darc.ps1 | 15 +++---- eng/common/sdl/NuGet.config | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/sdl/init-sdl.ps1 | 8 ---- eng/common/sdl/sdl.ps1 | 4 +- .../job/publish-build-assets.yml | 23 ++++++---- .../templates-official/job/source-build.yml | 8 ++++ .../templates-official/jobs/source-build.yml | 8 ++++ .../post-build/post-build.yml | 10 +++-- .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates-official/steps/execute-sdl.yml | 2 - .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 40 +++++++++++++++++ .../templates/job/publish-build-assets.yml | 23 ++++++---- eng/common/templates/job/source-build.yml | 8 ++++ eng/common/templates/jobs/source-build.yml | 8 ++++ .../templates/post-build/post-build.yml | 10 +++-- .../post-build/setup-maestro-vars.yml | 28 ++++++------ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ eng/common/templates/steps/execute-sdl.yml | 7 +-- .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 40 +++++++++++++++++ .../templates/steps/telemetry-start.yml | 2 +- global.json | 2 +- 27 files changed, 356 insertions(+), 78 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/NuGet.config b/NuGet.config index d7187b4d64a..e54eda8378c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,15 @@ + + + + + + + + + @@ -10,5 +19,15 @@ - + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a55be9b7fc2..34d8a2c4a96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd @@ -100,9 +100,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd diff --git a/eng/Versions.props b/eng/Versions.props index 8d86f6eb54f..81727cf8c63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,8 @@ - 17.11.7release + 17.11.8 + release 17.10.4 15.1.0.0 preview @@ -49,7 +50,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.24311.3 + 8.0.0-beta.24460.4 7.0.0 6.0.0 4.11.0-3.24313.9 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d7..238945cb5ab 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -31,13 +30,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 3849bdb3cf5..5bfbb02ef04 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4715d75e974..81ded5b7f47 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,7 +6,6 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -75,7 +74,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -104,7 +103,6 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` - -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 3ac1d92b370..588ff8e22fb 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,7 +3,6 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -21,14 +20,7 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" -$zipFile = "$WorkingDirectory/gdn.zip" - Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d7d..7fe603fe995 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,6 +4,8 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, + [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", + # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -19,7 +21,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 589ac80a18b..0117328800c 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -76,13 +76,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -137,14 +140,16 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f193dfbe236..f983033bb02 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -62,6 +68,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb11..5cf6a269c0b 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..b81b8770b34 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -272,14 +272,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 00000000000..93a8394a666 --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 07426fde05d..301d5c591eb 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 00000000000..c0e8f91317f --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 00000000000..55e33bd38f7 --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,40 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 8ec0151def2..cc2b346ba8b 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -74,13 +74,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -133,14 +136,16 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b72..c0ff472b697 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -61,6 +67,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb51d..5f46bfa895c 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index aba44a25a33..c3b6a3012fe 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -268,14 +268,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4a..64b9abc6850 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,13 +11,14 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 00000000000..54dc9416c51 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 07426fde05d..fe0ebf8c904 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' @@ -36,16 +34,19 @@ steps: displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: # We want to publish the Guardian results and configuration for easy diagnosis. However, the diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 00000000000..c0e8f91317f --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 00000000000..55e33bd38f7 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,40 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 32c01ef0b55..6abbcb33a67 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -8,7 +8,7 @@ parameters: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 + - task: AzureKeyVault@2 inputs: azureSubscription: 'HelixProd_KeyVault' KeyVaultName: HelixProdKV diff --git a/global.json b/global.json index 1febd36af30..5f2e94dca37 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24460.4" } } From a69bbaaf5f8d7249b8cab7309e81ad2221ce396c Mon Sep 17 00:00:00 2001 From: Mariana Dematte Date: Wed, 11 Sep 2024 17:29:05 -0700 Subject: [PATCH 05/10] Upgrade system.text.json to 8.0.4 (#10650) Will address dotnet/sdk#43339 when deployed in VS. --------- Co-authored-by: Rainer Sigwald --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- eng/Version.Details.xml | 2 +- eng/Versions.props | 7 +++---- src/MSBuild/app.amd64.config | 4 ++-- src/MSBuild/app.config | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 187a4bad2e3..3297ebc78a2 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34d8a2c4a96..fb9cbbab050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,7 +53,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd diff --git a/eng/Versions.props b/eng/Versions.props index 81727cf8c63..8ea5ec67839 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,11 +2,10 @@ - 17.11.8 - release + 17.11.9release 17.10.4 15.1.0.0 - preview + servicing true true @@ -39,7 +38,7 @@ 8.0.0 5.0.0 7.0.0 - 8.0.3 + 8.0.4 8.0.0 8.0.0 8.0.1 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 906e99877e8..e2459e8b279 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -134,8 +134,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index be398bb72d4..a7dc91112da 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -94,7 +94,7 @@ - + From 3618188f1c2a97eeeadd608efe132a490e47f27d Mon Sep 17 00:00:00 2001 From: Mariana Dematte Date: Wed, 25 Sep 2024 00:55:18 -0700 Subject: [PATCH 06/10] disable loc (#10693) Part of: #10665 Disabling localization for 17.11. --- .vsts-dotnet.yml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 574030d517f..8d1e966bdf7 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -34,7 +34,7 @@ variables: - name: SourceBranch value: '' - name: EnableReleaseOneLocBuild - value: true # Enable loc for vs17.11 + value: false # disable loc for vs17.11 - name: Codeql.Enabled value: true - group: DotNet-MSBuild-SDLValidation-Params diff --git a/eng/Versions.props b/eng/Versions.props index 8ea5ec67839..ad6fc740577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.9release + 17.11.10release 17.10.4 15.1.0.0 servicing From aca7250b250a3f8a90817547638256b0eec03950 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Fri, 27 Sep 2024 11:27:21 +0200 Subject: [PATCH 07/10] zzz --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d2ea3fd097e..d4ea68c2416 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.12.0release + 17.12.12release 17.11.4 15.1.0.0 preview From b97fc8e6ca31f60c90e51431e69e502d1ba8acab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:06:42 +0200 Subject: [PATCH 08/10] [vs17.11] Update dependencies from dotnet/arcade (#10691) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 5 +++-- global.json | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9cbbab050..f9ce28e815b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 @@ -100,9 +100,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 diff --git a/eng/Versions.props b/eng/Versions.props index ad6fc740577..55d25631bf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,8 @@ - 17.11.10release + 17.11.11release + release 17.10.4 15.1.0.0 servicing @@ -49,7 +50,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.24460.4 + 8.0.0-beta.24475.3 7.0.0 6.0.0 4.11.0-3.24313.9 diff --git a/global.json b/global.json index 5f2e94dca37..371719d0493 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24460.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3" } } From 5f069049d008fba3908358317b41fd361d567f50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:55:20 +0200 Subject: [PATCH 09/10] [vs17.11] Update dependencies from dotnet/arcade (#10793) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1 * bump the version --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 5 +++-- eng/common/tools.ps1 | 2 +- global.json | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9ce28e815b..566b6a35589 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 @@ -100,9 +100,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 diff --git a/eng/Versions.props b/eng/Versions.props index 55d25631bf6..20a1d157173 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,8 @@ - 17.11.11release + 17.11.12 + release release 17.10.4 15.1.0.0 @@ -50,7 +51,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.24475.3 + 8.0.0-beta.24508.1 7.0.0 6.0.0 4.11.0-3.24313.9 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda41..a2dedaa5297 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 371719d0493..50fbb6b9df9 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1" } } From e836b71e830882406e9b26d8bfaf109b690359d4 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:52:55 +0200 Subject: [PATCH 10/10] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9463a72647..d62a9021240 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.12.3release + 17.12.4release 17.11.4 15.1.0.0 preview