Merge remote-tracking branch 'origin/v15.6' into v15.7

microsoft · Mar 17, 2018 · e221f73 · e221f73
2 parents 9f6f641 + a482956
commit e221f73
Show file tree

Hide file tree

Showing 42 changed files with 333 additions and 223 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,9 +19,7 @@ environment:
   TreatWarningsAsErrors: true
   CodeAnalysisTreatWarningsAsErrors: true
 before_build:
-- |- # Restore TWICE. See https://github.com/AArnott/Nerdbank.GitVersioning/issues/113#issuecomment-285903085
   msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /v:quiet /t:restore
-  msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /v:quiet /t:restore > nul
 build_script:
 - msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /fl /v:minimal /t:build,pack
 test_script:

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -1,55 +1,53 @@
-queue: VSEng-MicroBuildVS2017
-
 steps:
+- task: PowerShell@2
+  displayName: Set VSTS variables
+  inputs:
+    targetType: inline
+    script: |
+      if ($env:SignType -eq 'Real') {
+        $feedGuid = '09d8d03c-1ac8-456e-9274-4d2364527d99'
+      } else {
+        $feedGuid = 'da484c78-f942-44ef-b197-99e2a1bef53c'
+      }
+
+      Write-Host "##vso[task.setvariable variable=feedGuid]$feedGuid"
+
+      if ($env:ComputerName.StartsWith('factoryvm', [StringComparison]::OrdinalIgnoreCase)) {
+        Write-Host "Running on hosted queue"
+        Write-Host "##vso[task.setvariable variable=Hosted]true"
+      }
+
 - task: CmdLine@2
   inputs:
     script: |
       del /s /q "%userprofile%\.nuget\packages"
       del /s /q "%LocalAppData%\NuGet\Cache"
       del /s /q "%AppData%\tsd-cache"
   displayName: Purge package caches
+  condition: and(succeeded(), ne(variables['Hosted'], 'true'))
 
 - task: MicroBuildIBCMergePlugin@0
   inputs:
     branch: rel/d15.7
+  condition: and(succeeded(), ne(variables['Hosted'], 'true'))
 
 - task: MicroBuildSigningPlugin@1
   inputs:
     signType: $(SignType)
     esrpSigning: true
     zipSources: false
 
-- task: PowerShell@2
-  displayName: Set package upload feed
-  inputs:
-    targetType: inline
-    script: |
-      if ($env:SignType -eq 'Real') {
-        $feedGuid = '09d8d03c-1ac8-456e-9274-4d2364527d99'
-      } else {
-        $feedGuid = 'da484c78-f942-44ef-b197-99e2a1bef53c'
-      }
-
-      Write-Host "##vso[task.setvariable variable=feedGuid]$feedGuid"
-
 - task: NuGetCommand@2
   inputs:
     restoreSolution: '**\*.sln'
     feedsToUse: config
     nugetConfigPath: nuget.config
   displayName: Nuget restore packages
 
-- task: NuGetCommand@2
-  inputs:
-    restoreSolution: '**\*.sln'
-    feedsToUse: config
-    nugetConfigPath: nuget.config
-  displayName: Nuget restore packages (again, to workaround Nuget bug)
-
 - task: VSBuild@1
   inputs:
     vsVersion: 15.0
-    msbuildArgs: /t:build,pack
+    msbuildArgs: /t:build,pack /m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
     platform: $(BuildPlatform)
     configuration: $(BuildConfiguration)
   displayName: Build Visual Studio solution
@@ -66,6 +64,13 @@ steps:
 #    ArtifactType: Container
 #  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: $(Build.ArtifactStagingDirectory)/build_logs
+    ArtifactName: build_logs
+    ArtifactType: Container
+  condition: succeededOrFailed()
+
 - task: CopyFiles@1
   inputs:
     SourceFolder: bin
@@ -101,12 +106,12 @@ steps:
     ArtifactType: Container
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
-- task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
+- task: PublishSymbols@2
   inputs:
-    symbolServiceURI: "https://microsoft.artifacts.visualstudio.com/DefaultCollection"
-    requestName: "CollectionId/$(System.CollectionId)/ProjectId/$(System.TeamProjectId)/BuildId/$(Build.BuildId)"
-    sourcePath: "$(Build.ArtifactStagingDirectory)/symbols"
-    usePat: "false"
+    SymbolsFolder: $(Build.ArtifactStagingDirectory)/symbols
+    SearchPattern: '**/*.pdb'
+    IndexSources: false
+    SymbolServerType: TeamServices
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
 - task: NuGetCommand@2

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\</BaseOutputPath>
 
-    <MicroBuildVersion>2.0.44</MicroBuildVersion>
+    <MicroBuildVersion>2.0.54</MicroBuildVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
@@ -13,14 +13,4 @@
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
   </ItemGroup>
-
-  <!-- Workaround https://github.com/AArnott/Nerdbank.GitVersioning/issues/113#issuecomment-285903085 -->
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\2.1.23\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\2.1.23\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-      BeforeTargets="_GenerateRestoreProjectSpec"
-      DependsOnTargets="GetBuildVersion"
-      Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>
diff --git a/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.cs.xlf b/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.cs.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="cs" original="MICROSOFT.VISUALSTUDIO.THREADING.ANALYZERS/STRINGS.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
     <header>
@@ -29,15 +29,13 @@
         <trans-unit id="VSTHRD010_MessageFormat" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Call {1}() or await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="needs-review-translation">Službu Visual Studio {0} je třeba používat explicitně v hlavním vlákně.
-Nejprve zavolejte ThreadHelper.ThrowIfNotOnUIThread() nebo počkejte na JoinableTaskFactory.SwitchToMainThreadAsync().</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Typ {0} by se měl používat explicitně v hlavním vlákně.
+Zavolejte metodu {1}() nebo nejdříve počkejte na dokončení volání metody JoinableTaskFactory.SwitchToMainThreadAsync().</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_Title" translate="yes" xml:space="preserve">
           <source>Invoke single-threaded types on Main thread</source>
-          <target state="needs-review-translation">Použití služeb VS z vlákna uživatelského rozhraní</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Vyvolání typů s jedním vláknem z hlavního vlákna</target>
         </trans-unit>
         <trans-unit id="VSTHRD100_MessageFormat" translate="yes" xml:space="preserve">
           <source>Avoid "async void" methods, because any exceptions not handled by the method will crash the process.</source>
@@ -179,17 +177,17 @@ Použijte raději AsyncLazy&lt;T&gt;.</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_MessageFormat" translate="yes" xml:space="preserve">
           <source>Thread affinity checks should be unconditional.</source>
-          <target state="new">Thread affinity checks should be unconditional.</target>
+          <target state="translated">Kontroly spřažení vláken by měly být bez podmínek.</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_Title" translate="yes" xml:space="preserve">
           <source>Assert thread affinity unconditionally</source>
-          <target state="new">Assert thread affinity unconditionally</target>
+          <target state="translated">Vyhodnotit spřažení vláken bez podmínek</target>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_NoAssertingMethod" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="new">The type "{0}" should be used on main thread explicitly.
-Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</target>
+          <target state="translated">Typ {0} by se měl používat explicitně v hlavním vlákně.
+Nejdříve počkejte na dokončení volání metody JoinableTaskFactory.SwitchToMainThreadAsync().</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_TransitiveMainThreadUser" translate="yes" xml:space="preserve">

diff --git a/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.de.xlf b/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.de.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="de" original="MICROSOFT.VISUALSTUDIO.THREADING.ANALYZERS/STRINGS.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
     <header>
@@ -29,15 +29,13 @@
         <trans-unit id="VSTHRD010_MessageFormat" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Call {1}() or await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="needs-review-translation">Der Visual Studio-Dienst "{0}" sollte explizit im Hauptthread verwendet werden.
-Rufen Sie "ThreadHelper.ThrowIfNotOnUIThread()" auf, oder warten Sie zuerst auf "JoinableTaskFactory.SwitchToMainThreadAsync()".</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Der Typ "{0}" muss explizit im Hauptthread verwendet werden.
+Rufen Sie "{1}()" auf, oder warten Sie zuerst auf "JoinableTaskFactory.SwitchToMainThreadAsync()".</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_Title" translate="yes" xml:space="preserve">
           <source>Invoke single-threaded types on Main thread</source>
-          <target state="needs-review-translation">VS-Dienste aus dem UI-Thread verwenden</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Singlethread-Typen im Hauptthread aufrufen</target>
         </trans-unit>
         <trans-unit id="VSTHRD100_MessageFormat" translate="yes" xml:space="preserve">
           <source>Avoid "async void" methods, because any exceptions not handled by the method will crash the process.</source>
@@ -179,17 +177,17 @@ Verwenden Sie stattdessen "AsyncLazy&lt;T&gt;".</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_MessageFormat" translate="yes" xml:space="preserve">
           <source>Thread affinity checks should be unconditional.</source>
-          <target state="new">Thread affinity checks should be unconditional.</target>
+          <target state="translated">Überprüfungen der Threadaffinität dürfen keine Bedingungen umfassen.</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_Title" translate="yes" xml:space="preserve">
           <source>Assert thread affinity unconditionally</source>
-          <target state="new">Assert thread affinity unconditionally</target>
+          <target state="translated">Threadaffinität ohne Bedingungen bestätigen</target>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_NoAssertingMethod" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="new">The type "{0}" should be used on main thread explicitly.
-Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</target>
+          <target state="translated">Der Typ "{0}" muss explizit im Hauptthread verwendet werden.
+Warten Sie zuerst auf "JoinableTaskFactory.SwitchToMainThreadAsync()".</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_TransitiveMainThreadUser" translate="yes" xml:space="preserve">

diff --git a/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.es.xlf b/...reading.Analyzers/MultilingualResources/Microsoft.VisualStudio.Threading.Analyzers.es.xlf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="es" original="MICROSOFT.VISUALSTUDIO.THREADING.ANALYZERS/STRINGS.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
     <header>
@@ -29,15 +29,13 @@
         <trans-unit id="VSTHRD010_MessageFormat" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Call {1}() or await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="needs-review-translation">El servicio "{0}" de Visual Studio debe usarse explícitamente en el subproceso principal. 
-Llame a ThreadHelper.ThrowIfNotOnUIThread() o el elemento await JoinableTaskFactory.SwitchToMainThreadAsync() en primer lugar.</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">El tipo "{0}" debe usarse en el subproceso principal de forma explícita.
+Llame a {1}() o use await JoinableTaskFactory.SwitchToMainThreadAsync() primero.</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_Title" translate="yes" xml:space="preserve">
           <source>Invoke single-threaded types on Main thread</source>
-          <target state="needs-review-translation">Use servicios de VS desde el subproceso de IU</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Invocar tipos uniproceso en el subproceso principal</target>
         </trans-unit>
         <trans-unit id="VSTHRD100_MessageFormat" translate="yes" xml:space="preserve">
           <source>Avoid "async void" methods, because any exceptions not handled by the method will crash the process.</source>
@@ -179,17 +177,17 @@ Use AsyncLazy&lt;T&gt; en su lugar.</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_MessageFormat" translate="yes" xml:space="preserve">
           <source>Thread affinity checks should be unconditional.</source>
-          <target state="new">Thread affinity checks should be unconditional.</target>
+          <target state="translated">Las comprobaciones de afinidad de subproceso deben ser incondicionales.</target>
         </trans-unit>
         <trans-unit id="VSTHRD108_Title" translate="yes" xml:space="preserve">
           <source>Assert thread affinity unconditionally</source>
-          <target state="new">Assert thread affinity unconditionally</target>
+          <target state="translated">Declarar afinidad de subproceso incondicionalmente</target>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_NoAssertingMethod" translate="yes" xml:space="preserve">
           <source>The type "{0}" should be used on main thread explicitly.
 Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</source>
-          <target state="new">The type "{0}" should be used on main thread explicitly.
-Await JoinableTaskFactory.SwitchToMainThreadAsync() first.</target>
+          <target state="translated">El tipo "{0}" debe usarse en el subproceso principal de forma explícita.
+Use await JoinableTaskFactory.SwitchToMainThreadAsync() primero.</target>
           <note from="MultilingualBuild" annotates="source" priority="2">{0} is a type name and {1} is the name of a method that throws if not called from the main thread.</note>
         </trans-unit>
         <trans-unit id="VSTHRD010_MessageFormat_TransitiveMainThreadUser" translate="yes" xml:space="preserve">