diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs index 45f63fa32b3..9bc90b1f3c8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs @@ -95,33 +95,18 @@ public override bool Execute() CLRSatelliteEmbeddedResource = clrSatelliteEmbeddedResourceList.ToArray(); } } - catch (Exception e) + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { - if (e is NullReferenceException || e is SEHException) + string errorId = Log.ExtractMessageCode(e.Message, out string message); + + if (string.IsNullOrEmpty(errorId)) { - throw; + errorId = UnknownErrorID; + message = SR.Format(SR.UnknownBuildError, message); } - else - { - string message; - string errorId; - errorId = Log.ExtractMessageCode(e.Message, out message); - - if (String.IsNullOrEmpty(errorId)) - { - errorId = UnknownErrorID; - message = SR.Format(SR.UnknownBuildError, message); - } + Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); - Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); - } - - return false; - } - catch // Non-CLS compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); return false; } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs index 70512ce153f..7fe267f51b8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs @@ -191,11 +191,6 @@ public override bool Execute() _nErrors++; } - catch // Non-CLS compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); - _nErrors++; - } if (_nErrors > 0) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs index 2ab3234ef87..207bccc64d6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs @@ -146,12 +146,6 @@ public override bool Execute() _nErrors++; } - catch // Non-CLS compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); - - _nErrors++; - } if (_nErrors > 0) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs index 764b4115727..2cdc4c7eb45 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs @@ -83,21 +83,9 @@ public override bool Execute() Log.LogMessageFromResources(nameof(SR.CommentFileGenerated), _outputFile); } } - catch (Exception e) + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { - if (e is NullReferenceException || e is SEHException) - { - throw; - } - else - { - Log.LogErrorFromException(e); - return false; - } - } - catch // Non-CLS compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); + Log.LogErrorFromException(e); return false; } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs index 000695ad454..e2a97918864 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs @@ -194,30 +194,17 @@ public override bool Execute() Log.LogMessageFromResources(MessageImportance.Low, nameof(SR.ResourcesGenerated), resourcesFile); } - catch (Exception e) + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { - if (e is NullReferenceException || e is SEHException) + string errorId = Log.ExtractMessageCode(e.Message, out string message); + + if (string.IsNullOrEmpty(errorId)) { - throw; + errorId = UnknownErrorID; + message = SR.Format(SR.UnknownBuildError, message); } - else - { - string message; - string errorId = Log.ExtractMessageCode(e.Message, out message); - - if (string.IsNullOrEmpty(errorId)) - { - errorId = UnknownErrorID; - message = SR.Format(SR.UnknownBuildError, message); - } - Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); - return false; - } - } - catch // Non-cls compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); + Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); return false; } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs index 8ef2af92084..d7c9c7ad64f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs @@ -90,33 +90,18 @@ public override bool Execute() { allFilesOk = ManageUids(); } - catch (Exception e) + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { - if (e is NullReferenceException || e is SEHException) + string errorId = Log.ExtractMessageCode(e.Message, out string message); + + if (string.IsNullOrEmpty(errorId)) { - throw; + errorId = UnknownErrorID; + message = SR.Format(SR.UnknownBuildError, message); } - else - { - string message; - string errorId; - errorId = Log.ExtractMessageCode(e.Message, out message); + Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); - if (String.IsNullOrEmpty(errorId)) - { - errorId = UnknownErrorID; - message = SR.Format(SR.UnknownBuildError, message); - } - - Log.LogError(null, errorId, null, null, 0, 0, 0, 0, message, null); - - allFilesOk = false; - } - } - catch // Non-CLS compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); allFilesOk = false; } @@ -388,28 +373,14 @@ private bool SetupBackupDirectory() return true; } - catch (Exception e) - { - if (e is NullReferenceException || e is SEHException) - { - throw; - } - else - { - Log.LogErrorWithCodeFromResources(nameof(SR.IntermediateDirectoryError), _backupPath); - return false; - } - } - catch // Non-cls compliant errors + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { Log.LogErrorWithCodeFromResources(nameof(SR.IntermediateDirectoryError), _backupPath); + return false; } } - - - /// /// Verify the Uids in the file /// @@ -985,16 +956,7 @@ internal bool UpdateUidWrite() WriteTillEof(); return true; } - catch (Exception e) - { - if (e is NullReferenceException || e is SEHException) - { - throw; - } - - return false; - } - catch + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { return false; } @@ -1024,16 +986,7 @@ internal bool RemoveUidWrite() WriteTillEof(); return true; } - catch (Exception e) - { - if (e is NullReferenceException || e is SEHException) - { - throw; - } - - return false; - } - catch + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { return false; } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs index b0e503f1588..c307ab2b8a2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs @@ -122,21 +122,9 @@ public override bool Execute() } } - catch (Exception e) + catch (Exception e) when (e is not (NullReferenceException or SEHException)) { - if (e is NullReferenceException || e is SEHException) - { - throw; - } - else - { - Log.LogErrorFromException(e); - successful = false; - } - } - catch // Non-cls compliant errors - { - Log.LogErrorWithCodeFromResources(nameof(SR.NonClsError)); + Log.LogErrorFromException(e); successful = false; } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 0feda021e68..ddbf4f479c9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -12,13 +12,7 @@ --> - - $(NoWarn);1058 + $(NoWarn) None PresentationBuildTasks diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx index 5657605e2b0..bd4d5a42d8c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx @@ -219,9 +219,6 @@ Unknown build error, '{0}' - - BG1001: Unknown CLS exception. - BG1002: File '{0}' cannot be found. @@ -834,4 +831,4 @@ MC8002: BracketCharacter '{0}' at Line Number '{1}' and Line Position '{2}' does not have a corresponding opening/closing BracketCharacter. - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs index 3942603fcd4..ed16ad914e1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs @@ -556,14 +556,6 @@ private void ResponseCallback(IAsyncResult ar) throw; } - catch // catch (and re-throw) all kinds of exceptions so we can inform the other thread - { - // inform other thread of error condition - _erroredOut= true; - _erroredOutException = null; - - throw; - } finally { webResponse?.Close(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index da1d32be5fa..91f1f68f913 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -2,7 +2,7 @@ $(DefineConstants);CORE_NATIVEMETHODS;PRESENTATION_CORE;COMMONDPS - $(NoWarn);0618;0436;1058;1705;3001;3002;3003;3009;3024 + $(NoWarn);0618;0436;1705;3001;3002;3003;3009;3024 true $(NoWarn);SYSLIB5005 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx index 186693ac403..cca7b40768a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx @@ -1747,9 +1747,6 @@ Next Page - - Text formatting engine encountered a non-CLS exception. - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf index ba6aa8c7ff7..ae233b86770 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf @@ -2402,11 +2402,6 @@ Další stránka - - Text formatting engine encountered a non-CLS exception. - Nástroj formátování textu narazil na výjimku, která není CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Nepodporovaná metoda syntaxe identifikátoru URI. Metoda očekává relativní identifikátor URI nebo balík://application:,,,/ jako formu absolutního identifikátoru URI. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf index 4b1756317e7..daec235c3f6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf @@ -2402,11 +2402,6 @@ Nächste Seite - - Text formatting engine encountered a non-CLS exception. - Vom Textformatierungsmodul wurde eine Nicht-CLS-Ausnahme entdeckt. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Nicht unterstützte URI-Syntax. Von der Methode wird ein relativer URI oder die folgende Form eines absoluten URI erwartet: "pack://application:,,,/". diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf index 8487c54bc06..db9c0220d0f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf @@ -2402,11 +2402,6 @@ Página siguiente - - Text formatting engine encountered a non-CLS exception. - El motor de formato de texto encontró una excepción no CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Sintaxis de Uri no admitida. El método espera un Uri relativo o un formato pack://aplicación:,,,/ de un Uri absoluto. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf index 615026eeac9..174b471626b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf @@ -2402,11 +2402,6 @@ Page suivante - - Text formatting engine encountered a non-CLS exception. - Le moteur de mise en forme du texte a rencontré une exception autre qu'une exception CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Syntaxe d'URI non prise en charge. La méthode attend un URI relatif ou un pack://application:,,,/ sous la forme d'un URI absolu. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf index b31798433f9..278200672fc 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf @@ -2402,11 +2402,6 @@ Pagina successiva - - Text formatting engine encountered a non-CLS exception. - Motore di formattazione del testo: rilevata eccezione non CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Sintassi URI non supportata. Per il metodo è previsto un URI relativo oppure un URI assoluto di tipo pack://applicazione:,,,/. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf index 0cc18516807..691c784232a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf @@ -2402,11 +2402,6 @@ 次のページ - - Text formatting engine encountered a non-CLS exception. - テキスト形式設定エンジンに、非 CLS 例外が発生しました。 - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. サポートされていない URI 構文です。メソッドでは、相対 URI または絶対 URI の pack://application:,,,/ 形式が必要です。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf index 14f62b234d1..eb55d17a4b1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf @@ -2402,11 +2402,6 @@ 다음 페이지 - - Text formatting engine encountered a non-CLS exception. - 텍스트 서식 엔진에서 비 CLS 예외가 발생했습니다. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. 지원되지 않는 URI 구문입니다. 메서드에 상대 URI 또는 pack://application:,,,/ 형식의 절대 URI가 필요합니다. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf index aca84fad3a8..e1e20d12810 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf @@ -2402,11 +2402,6 @@ Następna strona - - Text formatting engine encountered a non-CLS exception. - Aparat formatowania tekstu napotkał wyjątek niezgodny z CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Nieobsługiwana składnia identyfikatora URI. Metoda oczekuje względnego identyfikatora URI lub absolutnego identyfikatora URI w postaci pakiet://aplikacja:,,,/. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf index fa7d3b07dbf..75e0164991e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf @@ -2402,11 +2402,6 @@ Próxima Página - - Text formatting engine encountered a non-CLS exception. - O mecanismo de formatação de texto encontrou uma exceção diferente de CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Sintaxe de Uri sem suporte. O método espera um Uri relativo ou uma forma de Uri absoluto pack://aplicativo:,,,/. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf index 281be405ed7..66c63d66abe 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf @@ -2402,11 +2402,6 @@ Следующая страница - - Text formatting engine encountered a non-CLS exception. - Процессор форматирования текста обнаружил исключение, которое не относится к CLS. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Недопустимый синтаксис идентификатора URI. Методу требуется относительный идентификатор URI или форма "pack://application:,,,/" абсолютного идентификатора URI. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf index 53e3a858840..36550fc28d0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf @@ -2402,11 +2402,6 @@ Sonraki Sayfa - - Text formatting engine encountered a non-CLS exception. - Metin biçimlendirme altyapısı CLS dışı bir özel durumla karşılaştı. - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. Desteklenmeyen Uri sözdizimi. Metot göreli bir Uri veya pack://application:,,,/ biçiminde mutlak Uri bekliyor. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf index 6ada1fd2f64..a399787532d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf @@ -2402,11 +2402,6 @@ 下一页 - - Text formatting engine encountered a non-CLS exception. - 文本格式化引擎遇到非 CLS 异常。 - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. 不支持的 URI 语法。方法需要相对 URI 或“pack://application:,,,/”格式的绝对 URI。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf index 8d935d25dd8..23a031aeec9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf @@ -2402,11 +2402,6 @@ 下一頁 - - Text formatting engine encountered a non-CLS exception. - 文字格式設定引擎發現非 CLS 例外狀況。 - - Unsupported Uri syntax. Method expects a relative Uri or a pack://application:,,,/ form of absolute Uri. 不支援的 URI 語法。方法預期應有相對 URI 或 pack://application:,,,/ 格式的絕對 URI。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index d93ef8345b6..86d82e7fb06 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -4,7 +4,7 @@ PresentationCore-ref $(TargetGroup)-$(PackageId)/ $(DefineConstants);CORE_NATIVEMETHODS;PRESENTATION_CORE;COMMONDPS - $(NoWarn);0618;0436;1058;1705;3001;3002;3003;3009;3024 + $(NoWarn);0618;0436;1705;3001;3002;3003;3009;3024 true $(NoWarn) false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/DefaultAsyncDataDispatcher.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/DefaultAsyncDataDispatcher.cs index 625df428dbd..70fcf56d34f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/DefaultAsyncDataDispatcher.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/DefaultAsyncDataDispatcher.cs @@ -77,10 +77,6 @@ private void ProcessRequest(object o) request.Fail(ex); } - catch // non CLS compliant exception - { - request.Fail(new InvalidOperationException(SR.Format(SR.NonCLSException, "processing an async data request"))); - } // remove the request from the list lock (_list.SyncRoot) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/PropertyPathWorker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/PropertyPathWorker.cs index c689780bfc7..b0c6f3c3179 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/PropertyPathWorker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/PropertyPathWorker.cs @@ -1411,10 +1411,7 @@ private bool MatchIndexerParameters(PropertyInfo pi, IndexerParameterInfo[] aryI { if (CriticalExceptions.IsCriticalApplicationException(ex)) throw; - return false; - } - catch - { + return false; } } @@ -1527,10 +1524,6 @@ private object RawValue(int k) BindingOperations.LogException(ex); _host?.ReportGetValueError(k, item, ex); } - catch // non CLS compliant exception - { - _host?.ReportGetValueError(k, item, new InvalidOperationException(SR.Format(SR.NonCLSException, "GetValue"))); - } // catch the pseudo-exception as well if (o == IListIndexOutOfRange) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index 5ffebd18529..a7db45eb33e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -6,7 +6,7 @@ true false - $(NoWarn);0618;1058;SYSLIB5005 + $(NoWarn);0618;SYSLIB5005 None x86;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx index bc3332c3dc9..6b5d94e1465 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx @@ -2130,12 +2130,6 @@ Do you want to replace it? WeakEventManager supports only delegates with one target. - - Nonstandard exception occurred while activating the application. - - - Unknown exception during '{0}'. - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. @@ -2196,12 +2190,6 @@ Do you want to replace it? ObjectDataProvider needs either an ObjectType or ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf index 4624ca73dfb..0fd0498c2ba 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf @@ -3418,16 +3418,6 @@ Chcete ho nahradit? Nelze nastavit UpdateSourceTrigger ve vnitřním Binding funkce MultiBinding. Platný je pouze výchozí Immediate UpdateSourceTrigger. - - Unknown exception during '{0}'. - Neznámá výjimka během {0}. - - - - Nonstandard exception occurred while activating the application. - Při aktivaci aplikace se vyskytla nestandardní výjimka. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Nepodporovaná metoda syntaxe identifikátoru URI. Metoda očekává relativní identifikátor URI nebo balík://application:,,,/ jako formu absolutního identifikátoru URI. @@ -3508,16 +3498,6 @@ Chcete ho nahradit? ObjectDataProvider potřebuje buď ObjectType, nebo ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Neznámá výjimka pro vytváření typu {0} pro ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Neznámá výjimka pro vyvolávání metody {0} u typu {1} pro ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. Parametry ConstructorParameters nelze změnit, protože ObjectDataProvider používá uživatelem přidělenou ObjectInstance. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf index 84ab6fd3d39..accc0e26824 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf @@ -3418,16 +3418,6 @@ Möchten Sie das Element ersetzen? "UpdateSourceTrigger" kann nicht für internes Binding von "MultiBinding" festgelegt werden. Nur der standardmäßige direkte "UpdateSourceTrigger" ist gültig. - - Unknown exception during '{0}'. - Unbekannte Ausnahme während "{0}". - - - - Nonstandard exception occurred while activating the application. - Beim Aktivieren der Anwendung ist eine nicht dem Standard entsprechende Ausnahme aufgetreten. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Nicht unterstützte URI-Syntax. Von der Methode wird ein relativer URI oder die Form "pack://application:,,,/" eines absoluten URI erwartet. @@ -3508,16 +3498,6 @@ Möchten Sie das Element ersetzen? "ObjectDataProvider" erfordert entweder "ObjectType" oder "ObjectInstance". - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Unbekannte Ausnahme beim Erstellen des Typs "{0}" für "ObjectDataProvider". - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Unbekannte Ausnahme beim Abrufen der Methode "{0}" für den Typ "{1}" für ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. "ConstructorParameters" können nicht geändert werden, da von "ObjectDataProvider" eine vom Benutzer zugewiesene "ObjectInstance" verwendet wird. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf index 096ede01734..7329c451834 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? No se puede establecer UpdateSourceTrigger en el Binding interno de MultiBinding. Sólo el Immediate UpdateSourceTrigger predeterminado es válido. - - Unknown exception during '{0}'. - Excepción desconocida durante '{0}'. - - - - Nonstandard exception occurred while activating the application. - Ocurrió una excepción no estándar al activar la aplicación. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Sintaxis de URI no admitida. El método espera un URI relativo o un formato pack://aplicación:,,,/ de URI absoluto. @@ -3508,16 +3498,6 @@ Do you want to replace it? ObjectDataProvider necesita ObjectType u ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Excepción desconocida al crear el tipo '{0}' para ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Excepción desconocida al invocar el método "{0}" en el tipo "{1}" para ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. ConstructorParameters no se pueden cambiar porque ObjectDataProvider usa ObjectInstance asignado por el usuario. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf index 6729539463d..be0610f2fa7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf @@ -3418,16 +3418,6 @@ Voulez-vous le remplacer ? Impossible de définir UpdateSourceTrigger sur un Binding interne de MultiBinding. Seul l'Immediate UpdateSourceTrigger par défaut est valide. - - Unknown exception during '{0}'. - Exception inconnue pendant '{0}'. - - - - Nonstandard exception occurred while activating the application. - Une exception non standard s'est produite lors de l'activation de l'application. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Syntaxe d'URI non prise en charge. La méthode attend un URI relatif ou un pack://application:,,,/ sous la forme d'un URI absolu. @@ -3508,16 +3498,6 @@ Voulez-vous le remplacer ? ObjectDataProvider a besoin d'un ObjectType ou ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Exception inconnue lors de la création du type '{0}' pour ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Exception inconnue pendant l'appel de la méthode '{0}' pour le type '{1}' de ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. Impossible de modifier ConstructorParameters parce qu'ObjectDataProvider utilise l'ObjectInstance attribué par l'utilisateur. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf index 99b0f744e8f..6064ba60b8d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf @@ -3418,16 +3418,6 @@ Sostituirlo? Impossibile impostare UpdateSourceTrigger per il Binding interno di MultiBinding. È valido solo l'UpdateSourceTrigger diretto predefinito. - - Unknown exception during '{0}'. - Eccezione sconosciuta durante '{0}'. - - - - Nonstandard exception occurred while activating the application. - Eccezione non standard durante l'attivazione dell'applicazione. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Sintassi URI non supportata. Per il metodo è previsto un URI relativo oppure un URI assoluto di tipo pack://applicazione:,,,/. @@ -3508,16 +3498,6 @@ Sostituirlo? ObjectDataProvider richiede un ObjectType o una ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Eccezione sconosciuta durante la creazione del tipo '{0}' per ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Eccezione sconosciuta durante la chiamata del metodo '{0}' sul tipo '{1}' per ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. Impossibile modificare ConstructorParameters perché ObjectDataProvider utilizza una ObjectInstance assegnata dall'utente. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf index 08915578b59..09942bf2850 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? MultiBinding の内部 Binding で UpdateSourceTrigger を設定できません。既定の Immediate UpdateSourceTrigger のみが有効です。 - - Unknown exception during '{0}'. - '{0}' 中の不明な例外です。 - - - - Nonstandard exception occurred while activating the application. - アプリケーションのアクティブ化中に、標準でない例外が発生しました。 - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. サポートされていない URI 構文です。メソッドでは、相対 URI または絶対 URI の pack://application:,,,/ 形式が必要です。 @@ -3508,16 +3498,6 @@ Do you want to replace it? ObjectDataProvider には、ObjectType または ObjectInstance が必要です。 - - Unknown exception while creating type '{0}' for ObjectDataProvider. - ObjectDataProvider で型 '{0}' を作成中に、不明な例外が発生しました。 - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - ObjectDataProvider で型 '{1}' のメソッド '{0}' を起動中に、不明な例外が発生しました。 - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. ObjectDataProvider がユーザー割り当て ObjectInstance を使用しているため、ConstructorParameters は変更できません。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf index 7b048a21d95..dd1b078e78e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? MultiBinding의 내부 Binding에 UpdateSourceTrigger를 설정할 수 없습니다. 직접 관련된 기본 UpdateSourceTrigger만 사용할 수 있습니다. - - Unknown exception during '{0}'. - '{0}' 동안 알 수 없는 예외가 발생했습니다. - - - - Nonstandard exception occurred while activating the application. - 애플리케이션을 활성화하는 동안 비표준 예외가 발생했습니다. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. 지원되지 않는 URI 구문입니다. 메서드에 상대 URI 또는 pack://application:,,,/ 형식의 절대 URI가 필요합니다. @@ -3508,16 +3498,6 @@ Do you want to replace it? ObjectDataProvider에 ObjectType 또는 ObjectInstance가 있어야 합니다. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - ObjectDataProvider에 대한 '{0}' 형식을 만드는 동안 알 수 없는 예외가 발생했습니다. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - ObjectDataProvider에 대한 '{1}' 형식에 '{0}' 메서드를 호출하는 동안 알 수 없는 예외가 발생했습니다. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. ObjectDataProvider가 사용자가 지정한 ObjectInstance를 사용하고 있기 때문에 ConstructorParameters를 변경할 수 없습니다. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf index 29d5a111f84..d684d54a223 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf @@ -3418,16 +3418,6 @@ Czy chcesz go zastąpić? Nie można ustawić UpdateSourceTrigger dla wewnętrznego elementu Binding obiektu MultiBinding. Prawidłowy jest tylko domyślny element Immediate UpdateSourceTrigger. - - Unknown exception during '{0}'. - Nieznany wyjątek podczas „{0}”. - - - - Nonstandard exception occurred while activating the application. - Podczas aktywacji aplikacji wystąpił niestandardowy wyjątek. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Nieobsługiwana składnia identyfikatora URI. Metoda oczekuje względnego identyfikatora URI lub absolutnego identyfikatora URI w postaci pakiet://aplikacja:,,,/. @@ -3508,16 +3498,6 @@ Czy chcesz go zastąpić? ObjectDataProvider wymaga typu ObjectType lub wystąpienia ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Nieznany wyjątek podczas tworzenia typu „{0}” dla ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Nieznany wyjątek podczas wywoływania metody „{0}” w typie „{1}” dla ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. Nie można zmieniać ConstructorParameters, ponieważ ObjectDataProvider używa przypisanego przez użytkownika wystąpienia ObjectInstance. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf index 21df203b6f8..0d64db5ea8e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf @@ -3418,16 +3418,6 @@ Deseja substituí-lo? Não é possível definir UpdateSourceTrigger no Binding interno de MultiBinding. Somente Immediate UpdateSourceTrigger padrão é válido. - - Unknown exception during '{0}'. - Exceção desconhecida durante '{0}'. - - - - Nonstandard exception occurred while activating the application. - Exceção diferente do padrão ao ativar o aplicativo. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Sintaxe de URI sem-suporte. O método espera um URI relativo ou uma forma de URI absoluto pack://aplicativo:,,,/. @@ -3508,16 +3498,6 @@ Deseja substituí-lo? ObjectDataProvider precisa de um ObjectType ou ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Exceção desconhecida durante a criação do tipo '{0}' para ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Exceção desconhecida durante a invocação do método '{0}' no tipo '{1}' para ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. ConstructorParameters não podem ser alterados porque ObjectDataProvider está utilizando ObjectInstance atribuído pelo usuário. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf index f59c152a90b..14eb13c3599 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? Невозможно задать UpdateSourceTrigger для внутренней привязки Binding элемента MultiBinding. Для UpdateSourceTrigger допускается только значение по умолчанию Immediate. - - Unknown exception during '{0}'. - Неизвестное исключение во время "{0}". - - - - Nonstandard exception occurred while activating the application. - При активации приложения возникло нестандартное исключение. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Неподдерживаемый синтаксис URI. Метод ожидает относительный URI или абсолютный URI в формате pack://application:,,,/ . @@ -3508,16 +3498,6 @@ Do you want to replace it? Для ObjectDataProvider необходим ObjectType или ObjectInstance. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - Неизвестное исключение при создании типа "{0}" для ObjectDataProvider. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - Неизвестное исключение при вызове метода "{0}" для типа "{1}" для ObjectDataProvider. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. Изменение ConstructorParameters невозможно, так как ObjectDataProvider использует ObjectInstance, назначенный пользователем. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf index bd590be4cce..45b8743eda7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf @@ -3418,16 +3418,6 @@ Değiştirmek istiyor musunuz? MultiBinding'in iç Binding'de UpdateSourceTrigger ayarlanamaz. Yalnızca varsayılan Acil UpdateSourceTrigger geçerlidir. - - Unknown exception during '{0}'. - '{0}' sırasında bilinmeyen özel durum. - - - - Nonstandard exception occurred while activating the application. - Uygulama etkinleştirilirken standart olmayan özel durum oluştu. - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. Desteklenmeyen Uri sözdizimi. Metot göreli bir Uri veya pack://application:,,,/ biçiminde mutlak Uri bekliyor. @@ -3508,16 +3498,6 @@ Değiştirmek istiyor musunuz? ObjectDataProvider, ObjectType veya ObjectInstance'a gereksinim duyar. - - Unknown exception while creating type '{0}' for ObjectDataProvider. - ObjectDataProvider için '{0}' türü oluşturulurken bilinmeyen özel durum oluştu. - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - ObjectDataProvider için '{1}' türünde '{0}' metodu çağrılırken bilinmeyen özel durum oluştu. - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. ObjectDataProvider kullanıcı tarafından atanan ObjectInstance kullandığı için ConstructorParameters değiştirilemez. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf index 26805f30597..36df3198745 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? 无法在 MultiBinding 的内部 Binding 上设置 UpdateSourceTrigger。只有默认的 Immediate UpdateSourceTrigger 是有效的。 - - Unknown exception during '{0}'. - “{0}”期间发生未知异常。 - - - - Nonstandard exception occurred while activating the application. - 激活应用程序时发生非标准异常。 - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. 不支持的 URI 语法。方法需要相对 URI 或“pack://application:,,,/”格式的绝对 URI。 @@ -3508,16 +3498,6 @@ Do you want to replace it? ObjectDataProvider 需要 ObjectType 或 ObjectInstance。 - - Unknown exception while creating type '{0}' for ObjectDataProvider. - 创建 ObjectDataProvider 的类型“{0}”时，发生未知异常。 - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - 为 ObjectDataProvider 调用类型“{1}”上的方法“{0}”时，发生未知异常。 - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. 无法更改 ConstructorParameters，因为 ObjectDataProvider 正在使用用户分配的 ObjectInstance。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf index 4831a672076..ddadd1e3e79 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf @@ -3418,16 +3418,6 @@ Do you want to replace it? 無法在 MultiBinding 的內部 Binding 上設定 UpdateSourceTrigger。只有預設的 Immediate UpdateSourceTrigger 才有效。 - - Unknown exception during '{0}'. - '{0}' 時發生不明的例外狀況。 - - - - Nonstandard exception occurred while activating the application. - 啟動應用程式時發生非標準的例外狀況。 - - Unsupported URI syntax. Method expects a relative URI or a pack://application:,,,/ form of absolute URI. 不支援的 URI 語法。方法預期應有相對 URI 或 pack://application:,,,/ 格式的絕對 URI。 @@ -3508,16 +3498,6 @@ Do you want to replace it? ObjectDataProvider 需要 ObjectType 或 ObjectInstance。 - - Unknown exception while creating type '{0}' for ObjectDataProvider. - 為 ObjectDataProvider 建立型別 '{0}' 時發生不明的例外狀況。 - - - - Unknown exception while invoking method '{0}' on type '{1}' for ObjectDataProvider. - 在類型 '{1}'為 ObjectDataProvider 叫用 方法 '{0}' 時，發生不明的例外狀況。 - - ConstructorParameters cannot be changed because ObjectDataProvider is using user-assigned ObjectInstance. 無法變更 ConstructorParameters，因為 ObjectDataProvider 正在使用使用者指定的 ObjectInstance。 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpression.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpression.cs index 7dc144d90d7..566f584f011 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpression.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpression.cs @@ -1657,19 +1657,6 @@ private object ConvertHelper(IValueConverter converter, object value, Type targe } convertedValue = DependencyProperty.UnsetValue; } - catch // non CLS compliant exception - { - if (TraceData.IsEnabled) - { - TraceData.TraceAndNotify(TraceLevel, - TraceData.BadConverterForTransfer( - converter.GetType().Name, - AvTrace.ToStringHelper(value), - AvTrace.TypeName(value)), - this); - } - convertedValue = DependencyProperty.UnsetValue; - } return convertedValue; } @@ -1711,18 +1698,6 @@ private object ConvertBackHelper(IValueConverter converter, ProcessException(ex, ValidatesOnExceptions); convertedValue = DependencyProperty.UnsetValue; } - catch // non CLS compliant exception - { - if (TraceData.IsEnabled) - { - TraceData.TraceAndNotify(TraceEventType.Error, - TraceData.BadConverterForUpdate( - AvTrace.ToStringHelper(Value), - AvTrace.TypeName(value)), - this); - } - convertedValue = DependencyProperty.UnsetValue; - } return convertedValue; } @@ -1988,14 +1963,6 @@ internal override object UpdateSource(object value) SetStatus(BindingStatusInternal.UpdateSourceError); value = DependencyProperty.UnsetValue; } - catch // non CLS compliant exception - { - if (TraceData.IsEnabled) - TraceData.TraceAndNotify(TraceEventType.Error, TraceData.WorkerUpdateFailed, this); - - SetStatus(BindingStatusInternal.UpdateSourceError); - value = DependencyProperty.UnsetValue; - } finally { EndSourceUpdate(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs index 2de177c8f2d..c206af511b9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs @@ -2198,9 +2198,6 @@ private static object ConvertValue(object value, DependencyProperty dp, out Exce { e = ex; } - catch // non CLS compliant exception - { - } } if (!success) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ObjectDataProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ObjectDataProvider.cs index af41bc33b70..17dff022464 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ObjectDataProvider.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ObjectDataProvider.cs @@ -474,11 +474,6 @@ private object CreateObjectInstance(out Exception e) error = null; // indicate unknown error e = ex; } - catch // non CLS compliant exception - { - error = null; // indicate unknown error - e = new InvalidOperationException(SR.Format(SR.ObjectDataProviderNonCLSException, _objectType.Name)); - } if (e != null || error != null) { @@ -553,11 +548,6 @@ private object InvokeMethodOnInstance(out Exception e) error = null; // indicate unknown error e = ex; } - catch //FXCop Fix: CatchNonClsCompliantExceptionsInGeneralHandlers - { - error = null; // indicate unknown error - e = new InvalidOperationException(SR.Format(SR.ObjectDataProviderNonCLSExceptionInvoke, MethodName, _objectType.Name)); - } if (e != null || error != null) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlDataProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlDataProvider.cs index efd6549d7e3..e361e2e0d41 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlDataProvider.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlDataProvider.cs @@ -598,11 +598,6 @@ private void CreateDocFromExternalSource(WebRequest request) eventParameters: new object[] { ex }); } } - //FXCop Fix: CatchNonClsCompliantExceptionsInGeneralHandlers - catch - { - throw; - } if (ex != null) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/PropertyPath.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/PropertyPath.cs index 35c6fab0a06..ac56426bf8d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/PropertyPath.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/PropertyPath.cs @@ -794,18 +794,12 @@ private object GetTypedParamValue(string param, Type type, bool throwOnError) // we treat null as an "error", and keep trying for something // better. (See bug 861966) } - // catch all exceptions. We simply want to move on to the next - // candidate indexer. + // Catch all exceptions. We simply want to move on to the next candidate indexer. catch (Exception ex) { if (CriticalExceptions.IsCriticalApplicationException(ex) || throwOnError) throw; } - catch - { - if (throwOnError) - throw; - } } if (value == null && type.IsAssignableFrom(typeof(string))) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs index 9df84032f60..c339b287de2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs @@ -5909,10 +5909,6 @@ internal bool ConvertAndMatch(object state) throw; // if the conversion failed, just use the unconverted value } - catch // non CLS compliant exception - { - // if the conversion failed, just use the unconverted value - } } // cache the converted value diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index 5df41984bde..b8944b33b46 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);WeakEventTelemetry true false - $(NoWarn);0618;1058,3003 + $(NoWarn);0618;3003 None AnyCPU false