Merge remote-tracking branch 'dotnet/dev16.0.x' into merges/dev16.0.x…

…-to-dev16.0-preview2
dotnet · Nov 8, 2018 · e5edb9d · e5edb9d
2 parents b20f0bf + bf5d5eb
commit e5edb9d
Show file tree

Hide file tree

Showing 89 changed files with 845 additions and 591 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -11,8 +11,8 @@ queue:
 
 variables:
   BuildPlatform: 'Any CPU'
-  InsertTargetBranchFullName: 'lab/d16.0stg472'
-  InsertTargetBranchShortName: 'd16.0stg472'
+  InsertTargetBranchFullName: 'rel/d16.0'
+  InsertTargetBranchShortName: 'd16.0'
 steps:
 - task: NuGetCommand@2
   inputs:

diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
@@ -164,7 +164,7 @@
     <NuGetVisualStudioVersion>4.0.0-rc-2048</NuGetVisualStudioVersion>
     <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>
     <RestSharpVersion>105.2.3</RestSharpVersion>
-    <RoslynDependenciesOptimizationDataVersion>2.11.0-beta3.20181025.2</RoslynDependenciesOptimizationDataVersion>
+    <RoslynDependenciesOptimizationDataVersion>2.11.0-beta3.20181005.1</RoslynDependenciesOptimizationDataVersion>
     <RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
     <RoslynToolsMicrosoftLocateVSVersion>0.2.4-beta</RoslynToolsMicrosoftLocateVSVersion>
     <RoslynToolsVSIXExpInstallerVersion>1.0.0-beta2-63222-01</RoslynToolsVSIXExpInstallerVersion>

diff --git a/build/config/optprof.json b/build/config/optprof.json
@@ -9,15 +9,50 @@
             "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
           ]
         },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
+        },
+        {
+          "container": "TeamEng",
+          "testCases": [
+            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
+            "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
+          ]
+        },
+        {
+          "container": "VSLanguages",
+          "testCases": [
+            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
+          ]
+        },
         {
           "container": "VSPE",
           "testCases": [
-            "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
-            "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
             "VSPE.OptProfTests.vs_asl_cs_scenario",
-            "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
             "VSPE.OptProfTests.vs_asl_vb_scenario",
-            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp"
+            "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
+            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
+            "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
+            "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
+            "VSPE.OptProfTests.vs_perf_DesignTime_solution_loadclose_cs_picasso",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_loadclose_vb_australiangovernment"
+          ]
+        },
+        {
+          "container": "WinForms",
+          "testCases": [
+            "WinForms.OptProfTests.winforms_largeform_vb"
+          ]
+        },
+        {
+          "container": "XamlOptProf",
+          "testCases": [
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_DesignerIsolated",
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_DesignerIsolated"
           ]
         }
       ]
@@ -30,6 +65,19 @@
           "testCases": [
             "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
           ]
+        },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
+        },
+        {
+          "container": "TeamEng",
+          "testCases": [
+            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
+            "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
+          ]
         }
       ]
     },
@@ -41,6 +89,25 @@
           "testCases": [
             "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
           ]
+        },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
+        },
+        {
+          "container": "TeamEng",
+          "testCases": [
+            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
+            "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
+          ]
+        },
+        {
+          "container": "VSPE",
+          "testCases": [
+            "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment"
+          ]
         }
       ]
     },
@@ -52,24 +119,76 @@
           "testCases": [
             "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
           ]
+        },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
         }
       ]
     }
   ],
-  "assemblies" : [
+  "assemblies": [
     {
       "assembly": "System.Collections.Immutable.dll",
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
         {
           "container": "DDRIT.RPS.CSharp",
           "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
+          ]
+        },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
+        },
+        {
+          "container": "TeamEng",
+          "testCases": [
+            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
+            "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
+          ]
+        },
+        {
+          "container": "VSLanguages",
+          "testCases": [
+            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
+          ]
+        },
+        {
+          "container": "VSPE",
+          "testCases": [
+            "VSPE.OptProfTests.vs_asl_cs_scenario",
+            "VSPE.OptProfTests.vs_asl_vb_scenario",
+            "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
+            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
+            "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
+            "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
+            "VSPE.OptProfTests.vs_perf_DesignTime_solution_loadclose_cs_picasso",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_loadclose_vb_australiangovernment"
+          ]
+        },
+        {
+          "container": "WinForms",
+          "testCases": [
+            "WinForms.OptProfTests.winforms_largeform_vb"
+          ]
+        },
+        {
+          "container": "XamlOptProf",
+          "testCases": [
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_DesignerIsolated",
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_DesignerIsolated"
           ]
         }
       ]
@@ -79,14 +198,60 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
         {
           "container": "DDRIT.RPS.CSharp",
           "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
+          ]
+        },
+        {
+          "container": "DDRIT.RPS.ManagedLangs",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.ManagedLangsTest.ManagedLangs"
+          ]
+        },
+        {
+          "container": "TeamEng",
+          "testCases": [
+            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
+            "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
+          ]
+        },
+        {
+          "container": "VSLanguages",
+          "testCases": [
+            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
+          ]
+        },
+        {
+          "container": "VSPE",
+          "testCases": [
+            "VSPE.OptProfTests.vs_asl_cs_scenario",
+            "VSPE.OptProfTests.vs_asl_vb_scenario",
+            "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
+            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
+            "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
+            "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
+            "VSPE.OptProfTests.vs_perf_DesignTime_solution_loadclose_cs_picasso",
+            "VSPE.OptProfTests.vs_perf_designtime_solution_loadclose_vb_australiangovernment"
+          ]
+        },
+        {
+          "container": "WinForms",
+          "testCases": [
+            "WinForms.OptProfTests.winforms_largeform_vb"
+          ]
+        },
+        {
+          "container": "XamlOptProf",
+          "testCases": [
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_DesignerIsolated",
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_DesignerIsolated"
           ]
         }
       ]
@@ -96,7 +261,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -113,7 +278,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -130,7 +295,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -147,7 +312,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -164,7 +329,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -181,7 +346,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -198,7 +363,7 @@
       "instrumentationArguments": [
         {
           "relativeInstallationFolder": "MSBuild/15.0/Bin",
-          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
         }
       ],
       "tests": [
@@ -209,6 +374,23 @@
           ]
         }
       ]
+    },
+    {
+      "assembly": "Microsoft.CodeAnalysis.UnitTesting.SourceBasedTestDiscovery.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "Common7/IDE/CommonExtensions/Microsoft/ManagedLanguages/VBCSharp/SourceBasedTestDiscovery",
+          "instrumentationExecutable": "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.TestDiscovery",
+          "testCases": [
+            "Microsoft.Test.Performance.DDPerf.TestDiscovery_DDRIT.TestDiscovery"
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
@@ -251,7 +251,9 @@ function Build-Artifacts() {
     }
 
     if ($build -and $pack -and (-not $buildCoreClr)) {
-        Build-OptProfData
+        if ($official){
+            Build-OptProfData
+        }
     }
 
     if ($cibuild) {

diff --git a/build/scripts/createrunsettings.ps1 b/build/scripts/createrunsettings.ps1
@@ -19,7 +19,7 @@ try {
     $optProfToolExe = Join-Path $optProfToolDir "tools\roslyn.optprof.runsettings.generator.exe"
     $configFile = Join-Path $repoDir "build\config\optprof.json"
     $outputFolder = Join-Path $configDir "Insertion\RunSettings"
-    $optProfArgs = "--configFile $configFile --outputFolder $outputFolder --buildNumber 28218.3001 "
+    $optProfArgs = "--configFile $configFile --outputFolder $outputFolder --buildNumber 28302.01 "
 
     Exec-Console $optProfToolExe $optProfArgs
     exit 0

diff --git a/src/Compilers/Core/MSBuildTask/xlf/ErrorString.de.xlf b/src/Compilers/Core/MSBuildTask/xlf/ErrorString.de.xlf
@@ -126,7 +126,7 @@
       </trans-unit>
       <trans-unit id="MapSourceRoots.PathMustEndWithSlashOrBackslash">
         <source>{0} paths are required to end with a slash or backslash: '{1}'</source>
-        <target state="translated">{0}-Pfade müssen mit einem Schrägstrich oder einem umgekehrten Schrägstrich enden: '{1}'</target>
+        <target state="translated">{0}-Pfade müssen mit einem Schrägstrich oder einem umgekehrten Schrägstrich enden: "{1}"</target>
         <note />
       </trans-unit>
       <trans-unit id="MapSourceRoots.NoTopLevelSourceRoot">

diff --git a/src/Compilers/Core/MSBuildTask/xlf/ErrorString.es.xlf b/src/Compilers/Core/MSBuildTask/xlf/ErrorString.es.xlf
@@ -19,7 +19,7 @@
       </trans-unit>
       <trans-unit id="Csc_InvalidParameterWarning">
         <source>MSB3052: The parameter to the compiler is invalid, '{0}{1}' will be ignored.</source>
-        <target state="translated">MSB3052: El parámetro del compilador no es válido; '{0}{1}' se omitirá.</target>
+        <target state="translated">MSB3052: El parámetro del compilador no es válido; "{0}{1}" se omitirá.</target>
         <note>{StrBegin="MSB3052: "}</note>
       </trans-unit>
       <trans-unit id="General_CannotConvertStringToBool">