Fixes

dotnet · Sep 29, 2022 · 0e05bba · 0e05bba
1 parent bd1f0dc
commit 0e05bba
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 44 deletions.
diff --git a/src/BuiltInTools/dotnet-watch/Filters/MSBuildEvaluationFilter.cs b/src/BuiltInTools/dotnet-watch/Filters/MSBuildEvaluationFilter.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Watcher.Tools
 {
-    internal sealed class MSBuildEvaluationFilter : IWatchFilter
+    internal class MSBuildEvaluationFilter : IWatchFilter
     {
         // File types that require an MSBuild re-evaluation
         private static readonly string[] _msBuildFileExtensions = new[]
@@ -94,7 +94,7 @@ private bool RequiresMSBuildRevaluation(DotNetWatchContext context)
             return msbuildFiles;
         }
 
-        private DateTime GetLastWriteTimeUtcSafely(string file)
+        private protected virtual DateTime GetLastWriteTimeUtcSafely(string file)
         {
             try
             {

diff --git a/src/Tests/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs b/src/Tests/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs
@@ -123,7 +123,7 @@ public async Task ProcessAsync_SetsEvaluationRequired_IfMSBuildFileChanges_ButIs
             Assert.True(context.RequiresMSBuildRevaluation);
         }
 
-        public class TestableMSBuildEvaluationFilter : MSBuildEvaluationFilter
+        private class TestableMSBuildEvaluationFilter : MSBuildEvaluationFilter
         {
             public TestableMSBuildEvaluationFilter(IFileSetFactory factory)
                 : base(factory)
@@ -132,7 +132,7 @@ public TestableMSBuildEvaluationFilter(IFileSetFactory factory)
 
             public Dictionary<string, DateTime> Timestamps { get; } = new Dictionary<string, DateTime>();
 
-            protected override DateTime GetLastWriteTimeUtcSafely(string file) => Timestamps[file];
+            private protected override DateTime GetLastWriteTimeUtcSafely(string file) => Timestamps[file];
         }
     }
 }
diff --git a/src/Tests/dotnet-watch.Tests/Utilities/AssertEx.cs b/src/Tests/dotnet-watch.Tests/Utilities/AssertEx.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.Watcher.Tools
 {
-    public static class AssertEx
+    internal static class AssertEx
     {
         public static void EqualFileList(string root, IEnumerable<string> expectedFiles, FileSet actualFiles)
             => EqualFileList(root, expectedFiles, actualFiles.Select(f => f.FilePath));

diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.cs.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.cs.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Konfigurace NuGet",
   "description": "Soubor pro konfiguraci umístění, ve kterých bude NuGet hledat balíčky",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Otevře nuget.config v editoru."
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.de.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.de.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet-Konfig.",
   "description": "Eine Datei zum Konfigurieren der Speicherorte, in denen NuGet nach Paketen suchen wird",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Öffnet „nuget.config“ im Editor"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.es.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.es.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Configuración de NuGet",
   "description": "Un archivo para configurar las ubicaciones en las que NuGet buscará paquetes",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Abre nuget.config en el editor"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.fr.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.fr.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Configuration NuGet",
   "description": "Un fichier permettant de configurer les emplacements où NuGet recherche des packages",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Ouvre nuget.config dans l’éditeur"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.it.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.it.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Configurazione NuGet",
   "description": "Un file per la configurazione del NuGet dei percorsi eseguirà la ricerca dei pacchetti",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Apre nuget.config nell'editor"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ja.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ja.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet Config",
   "description": "NuGet がパッケージが検索する場所を構成するためのファイル",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "エディターで nuget.config を開く"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ko.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ko.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet 구성",
   "description": "NuGet 패키지를 검색할 위치를 구성하는 파일",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "편집기에서 nuget.config를 엽니다"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.pl.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.pl.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Konfigurowanie NuGet",
   "description": "Plik na potrzeby konfigurowania lokalizacji NuGet będzie wyszukiwać pakietów",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Otwiera plik nuget.config w edytorze"
 }
diff --git a/...t.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.pt-BR.json b/...t.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.pt-BR.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "Configuração do NuGet",
   "description": "Um arquivo para configurar os locais em que o NuGet procurará pacotes",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Abre nuget.config no editor"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ru.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.ru.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Майкрософт",
   "name": "Конфигурация NuGet",
   "description": "Файл для настройки расположений, в которых NuGet будет искать пакеты",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Открывает файл nuget.config в редакторе"
 }
diff --git a/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.tr.json b/...tNet.Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.tr.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet Yapılandırması",
   "description": "NuGet'in paketleri arama yapacağı konumları yapılandırmaya yönelik dosya",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "Düzenleyicide nuget.config’i açar"
 }
diff --git a/...Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.zh-Hans.json b/...Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet 配置",
   "description": "用于配置位置 NuGet 的文件将搜索包",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "在编辑器中打开 nuget.config"
 }
diff --git a/...Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.zh-Hant.json b/...Common.ItemTemplates/content/Nuget/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,8 +1,6 @@
-{
+{
   "author": "Microsoft",
   "name": "NuGet 組態",
   "description": "用於設定檔案位置 NuGet 將會搜尋套件",
-  "postActions/chmod/description": "Apply permissions",
-  "postActions/chmod/manualInstructions/default/text": "Run 'chmod 600 nuget.config'",
   "postActions/open-file/description": "在編輯器中開啟 nuget.config"
 }