Merge pull request #5014 from dotnet/merges/release/5.0.2xx-to-main

Merge release/5.0.2xx to main
dotnet · Apr 16, 2021 · 8cddd3d · 8cddd3d
2 parents 9a23d06 + 7aab728
commit 8cddd3d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/global.json b/global.json
@@ -1,22 +1,22 @@
 {
-  "tools": {
-    "dotnet": "6.0.100-preview.2.21155.3",
-    "runtimes": {
-      "dotnet": [
-        "3.1.7"
-      ]
+    "tools": {
+        "dotnet": "6.0.100-preview.2.21155.3",
+        "runtimes": {
+            "dotnet": [
+                "3.1.7"
+            ]
+        },
+        "vs": {
+            "version": "16.8"
+        },
+        "xcopy-msbuild": "16.8.0-preview2.1"
     },
-    "vs": {
-      "version": "16.8"
+    "sdk": {
+        "version": "6.0.100-preview.2.21155.3",
+        "allowPrerelease": true,
+        "rollForward": "patch"
     },
-    "xcopy-msbuild": "16.8.0-preview2.1"
-  },
-  "sdk": {
-    "version": "6.0.100-preview.2.21155.3",
-    "allowPrerelease": true,
-    "rollForward": "patch"
-  },
-  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17"
-  }
-}
+    "msbuild-sdks": {
+        "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17"
+    }
+}
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/xlf/CodeAnalysisDiagnosticsResources.ja.xlf b/src/Microsoft.CodeAnalysis.Analyzers/Core/xlf/CodeAnalysisDiagnosticsResources.ja.xlf
@@ -304,7 +304,7 @@
       </trans-unit>
       <trans-unit id="RemoveDuplicateEntriesBetweenAnalyzerReleasesRuleTitle">
         <source>Remove duplicate entries for diagnostic ID between analyzer releases</source>
-        <target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除する</target>
+        <target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除してください。</target>
         <note />
       </trans-unit>
       <trans-unit id="RemoveDuplicateEntriesForAnalyzerReleaseRuleDescription">

diff --git a/...alyzers/Core/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzer.cs b/...alyzers/Core/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzer.cs
@@ -125,7 +125,7 @@ public sealed partial class PlatformCompatibilityAnalyzer : DiagnosticAnalyzer
         public override void Initialize(AnalysisContext context)
         {
             context.EnableConcurrentExecution();
-            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
 
             context.RegisterCompilationStartAction(context =>
             {