Merge remote-tracking branch 'upstream/release/dev17.6-vs-deps' into …

…merges/release/dev17.6-to-release/dev17.6-vs-deps
ryzngard · Mar 30, 2023 · c0c07e3 · c0c07e3
2 parents 2331a28 + daad346
commit c0c07e3
Show file tree

Hide file tree

Showing 160 changed files with 2,804 additions and 2,714 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -222,7 +222,7 @@
       is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
       as our configured SDK, we must set the version to be the same.
      -->
-    <NuGetCommonVersion>6.4.0-rc.117</NuGetCommonVersion>
+    <NuGetCommonVersion>6.6.0-preview.3.57</NuGetCommonVersion>
     <NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
     <NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
     <NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>

diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json
@@ -143,9 +143,10 @@
         "Shipping",
         "NonShipping"
       ],
-      "vsBranch": "rel/d17.6",
+      "vsBranch": "main",
       "vsMajorVersion": 17,
-      "insertionTitlePrefix": "[d17.6P2]"
+      "insertionCreateDraftPR": false,
+      "insertionTitlePrefix": "[d17.6P3]"
     },
     "main": {
       "nugetKind": [
@@ -164,7 +165,7 @@
       ],
       "vsBranch": "main",
       "vsMajorVersion": 17,
-      "insertionCreateDraftPR": false,
+      "insertionCreateDraftPR": true,
       "insertionTitlePrefix": "[17.6P3]"
     },
     "dev/jorobich/fix-pr-val": {

diff --git a/global.json b/global.json
@@ -15,4 +15,4 @@
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23168.1"
   }
-}
+}
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.cs.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.cs.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.de.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.de.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.es.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.es.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.fr.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.fr.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.it.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.it.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ja.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ja.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ko.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ko.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.pl.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.pl.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.pt-BR.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.pt-BR.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ru.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.ru.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.tr.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.tr.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.zh-Hans.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.zh-Hans.xlf
diff --git a/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.zh-Hant.xlf b/src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.zh-Hant.xlf
diff --git a/src/Analyzers/CSharp/CodeFixes/xlf/CSharpCodeFixesResources.cs.xlf b/src/Analyzers/CSharp/CodeFixes/xlf/CSharpCodeFixesResources.cs.xlf
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,4 @@ @@
         "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1",
         "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23168.1"
       }
-    }
+    }