Bring release/vsmac17.4 up to release/dev17.4 #65650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

davidwengier merged 990 commits into dotnet:release/vsmac17.4 from davidwengier:release/vsmac17.4

Nov 29, 2022

+83,616 −59,678

Directory.Build.targets

-Original file line number
+Diff line change
@@ -1,5 +1,20 @@
     <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
     <Project>
+      <!-- use the source-built version of the reference packs if building in source-build -->
+      <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+        <KnownFrameworkReference Update="Microsoft.NETCore.App">
+          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
+        </KnownFrameworkReference>
+        <KnownFrameworkReference Update="Microsoft.AspNetCore.App">
+          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
+        </KnownFrameworkReference>
+      </ItemGroup>
+      <!-- do not restore or use the 6.0 app host in source-build -->
+      <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+        <UseAppHost>false</UseAppHost>
+      </PropertyGroup>
       <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
       <Import Project="eng\targets\Imports.targets" />
     </Project>

README.md

Large diffs are not rendered by default.

azure-pipelines-integration-scouting.yml

-Original file line number
+Diff line change
@@ -0,0 +1,95 @@
+    # Disable CI triggers
+    trigger: none
+    pr: none
+    # Nightly run of integration tests against the scouting queue
+    schedules:
+    - cron: "0 0 * * *"
+      displayName: Nightly builds
+      branches:
+        include:
+        - main
+        - main-vs-deps
+    parameters:
+    - name: poolName
+      displayName: Pool Name
+      type: string
+      default: NetCore-Public
+      values:
+      - NetCore-Public
+      - NetCore-Svc-Public
+    - name: queueName
+      displayName: Queue Name
+      type: string
+      default: windows.vs2022preview.scout.amd64.open
+      values:
+      - windows.vs2022.amd64.open
+      - windows.vs2022.scout.amd64.open
+      - windows.vs2022preview.amd64.open
+      - windows.vs2022preview.scout.amd64.open
+    - name: timeout
+      displayName: Timeout in Minutes
+      type: number
+      default: 150
+    stages:
+    - stage: Debug_Integration
+      dependsOn: []
+      variables:
+      - name: XUNIT_LOGS
+        value: $(Build.SourcesDirectory)\artifacts\log\Debug
+      jobs:
+      - job: VS_Integration_Debug_32
+        pool:
+          name: ${{ parameters.poolName }}
+          demands: ImageOverride -equals ${{ parameters.queueName }}
+        timeoutInMinutes: ${{ parameters.timeout }}
+        steps:
+          - template: eng/pipelines/test-integration-job.yml
+            parameters:
+              configuration: Debug
+              oop64bit: false
+              lspEditor: false
+      - job: VS_Integration_Debug_64
+        pool:
+          name: ${{ parameters.poolName }}
+          demands: ImageOverride -equals ${{ parameters.queueName }}
+        timeoutInMinutes: ${{ parameters.timeout }}
+        steps:
+          - template: eng/pipelines/test-integration-job.yml
+            parameters:
+              configuration: Debug
+              oop64bit: true
+              lspEditor: false
+    - stage: Release_Integration
+      dependsOn: []
+      variables:
+      - name: XUNIT_LOGS
+        value: $(Build.SourcesDirectory)\artifacts\log\Release
+      jobs:
+      - job: VS_Integration_Release_32
+        pool:
+          name: ${{ parameters.poolName }}
+          demands: ImageOverride -equals ${{ parameters.queueName }}
+        timeoutInMinutes: ${{ parameters.timeout }}
+        steps:
+          - template: eng/pipelines/test-integration-job.yml
+            parameters:
+              configuration: Release
+              oop64bit: false
+              lspEditor: false
+      - job: VS_Integration_Release_64
+        pool:
+          name: ${{ parameters.poolName }}
+          demands: ImageOverride -equals ${{ parameters.queueName }}
+        timeoutInMinutes: ${{ parameters.timeout }}
+        steps:
+          - template: eng/pipelines/test-integration-job.yml
+            parameters:
+              configuration: Release
+              oop64bit: true
+              lspEditor: false

azure-pipelines-official.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -319,7 +319,7 @@ stages:
  
            - OfficialBuild

          pool:

            name: NetCore1ESPool-Svc-Internal

            demands: ImageOverride -equals Build.Windows.Amd64.VS2022

            demands: ImageOverride -equals windows.vs2022.amd64

    - stage: insert

      dependsOn:

    @@ -331,7 +331,7 @@ stages:
  
        displayName: Insert to VS

        pool:

          name: NetCore1ESPool-Svc-Internal

          demands: ImageOverride -equals Build.Server.Amd64.VS2019

          demands: ImageOverride -equals windows.vs2022.amd64

        steps:

        - download: current

          artifact: VSSetup

azure-pipelines-pr-validation.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -243,4 +243,5 @@ stages: @@
             titlePrefix: ${{ parameters.OptionalTitlePrefix }}
             sourceBranch: $(SourceBranchName)
             publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
+            queueSpeedometerValidation: true

docs/Language Feature Status.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ efforts behind them. @@
     | [Cache delegates for static method group](https://github.com/dotnet/roslyn/issues/5835) | main | [Merged into 17.2](https://github.com/dotnet/roslyn/pull/58288) | [pawchen](https://github.com/pawchen) | [AlekseyTs](https://github.com/AlekseyTs), [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs) |
     | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [Merged into 17.3p2](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) |
     | [Relaxing Shift Operator](https://github.com/dotnet/csharplang/issues/4666) | main | [Merged into 17.3p2](https://github.com/dotnet/roslyn/issues/60967) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv)  | [MadsTorgersen](https://github.com/MadsTorgersen) |
-    | [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [Merged into 17.0p4 (preview langver)](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [RikkiGibson](https://github.com/RikkiGibson), [jcouv](https://github.com/jcouv) | [mattwar](https://github.com/mattwar) |
+    | [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [Merged into 17.0p4](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [RikkiGibson](https://github.com/RikkiGibson), [jcouv](https://github.com/jcouv) | [mattwar](https://github.com/mattwar) |
     # C# 10.0
@@ Expand Down @@

docs/wiki/Responding-to-customers-encountering-crashes-or-performance-issues.md

-Original file line number
+Diff line change
@@ Expand Up @@
     Thank you for providing feedback, and we're sorry to hear it's not behaving as you expect. Based on your description so far, it sounds like you are experiencing a problem which is historically hard to diagnose and resolve using the normal "steps to reproduce". We created a set of instructions for providing additional information which will help us track down the true source of the problems.
-    Based on the information provided so far, the most likely scenario to follow is for "Crashes". To provide the feedback most relevant for the problems you would like to see fixed, see [Crashes](https://docs.microsoft.com/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed#crashes).
+    Based on the information provided so far, the most likely scenario to follow is for "Crashes". Please take a look at the following document to provide the feedback most relevant for the problems you would like to see fixed:
+    https://docs.microsoft.com/en-us/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed?view=vs-2019#crashes
     ### Slowness and High CPU Issues
     Thank you for providing feedback, and we're sorry to hear it's not behaving as you expect. Based on your description so far, it sounds like you are experiencing a problem which is historically hard to diagnose and resolve using the normal "steps to reproduce". We created a set of instructions for providing additional information which will help us track down the true source of the problems.
-    Based on the information provided so far, the most likely scenario to follow is for "Slowness and High CPU Issues". To provide the feedback most relevant for the problems you would like to see fixed, see [Slowness and High CPU Issues](https://docs.microsoft.com/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed#slowness-and-high-cpu-issues).
+    Based on the information provided so far, the most likely scenario to follow is for "Slowness and High CPU Issues". Please look at the following document to provide the feedback most relevant for the problems you would like to see fixed:
+    https://docs.microsoft.com/en-us/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed?view=vs-2019#slowness-and-high-cpu-issues
     ### Out-Of-Process Issues
     Thank you for providing feedback, and we're sorry to hear it's not behaving as you expect. Based on your description so far, it sounds like you are experiencing a problem which is historically hard to diagnose and resolve using the normal "steps to reproduce". We created a set of instructions for providing additional information which will help us track down the true source of the problems.
-    Based on the information provided so far, the most likely scenario to follow is for "Out-Of-Process Issues". To provide the feedback most relevant for the problems you would like to see fixed, see [Out-of-process issues](https://docs.microsoft.com/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed#out-of-process-issues).
+    Based on the information provided so far, the most likely scenario to follow is for "Out-Of-Process Issues". Please look at the following document to provide the feedback most relevant for the problems you would like to see fixed:
+    https://docs.microsoft.com/en-us/visualstudio/ide/how-to-increase-chances-of-performance-issue-being-fixed?view=vs-2019#out-of-process-issues

eng/Version.Details.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,18 +13,18 @@
  
        </Dependency>

      </ProductDependencies>

      <ToolsetDependencies>

        <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22430.3">

        <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>ca202ec5e84706c6a90a0d85516608a43b374d54</Sha>

          <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>

          <SourceBuild RepoName="arcade" ManagedOnly="true" />

        </Dependency>

        <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">

          <Uri>https://github.com/dotnet/roslyn</Uri>

          <Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>

        </Dependency>

        <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22430.3">

        <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22524.5">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>ca202ec5e84706c6a90a0d85516608a43b374d54</Sha>

          <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>

        </Dependency>

      </ToolsetDependencies>

    </Dependencies>

eng/Versions.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,7 +8,7 @@
  
        <MajorVersion>4</MajorVersion>

        <MinorVersion>4</MinorVersion>

        <PatchVersion>0</PatchVersion>

        <PreReleaseVersionLabel>3</PreReleaseVersionLabel>

        <PreReleaseVersionLabel>6</PreReleaseVersionLabel>

        <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>

        <!--

          By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

    @@ -21,28 +21,28 @@
  
        <!-- Versions used by several individual references below -->

        <RoslynDiagnosticsNugetPackageVersion>3.3.4-beta1.22204.1</RoslynDiagnosticsNugetPackageVersion>

        <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22218.1</MicrosoftCodeAnalysisNetAnalyzersVersion>

        <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22415.2</MicrosoftCodeAnalysisTestingVersion>

        <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.132-beta</MicrosoftVisualStudioExtensibilityTestingVersion>

        <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22462.1</MicrosoftCodeAnalysisTestingVersion>

        <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.145-beta</MicrosoftVisualStudioExtensibilityTestingVersion>

        <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->

        <CodeStyleAnalyzerVersion>4.3.0-1.final</CodeStyleAnalyzerVersion>

        <VisualStudioEditorPackagesVersion>17.4.136-preview</VisualStudioEditorPackagesVersion>

        <VisualStudioEditorPackagesVersion>17.4.249</VisualStudioEditorPackagesVersion>

        <!-- This should generally be set to $(VisualStudioEditorPackagesVersion),

             but sometimes EditorFeatures.Cocoa specifically requires a newer editor build. -->

        <VisualStudioMacEditorPackagesVersion>17.3.133-preview</VisualStudioMacEditorPackagesVersion>

        <ILAsmPackageVersion>5.0.0-alpha1.19409.1</ILAsmPackageVersion>

        <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>

        <MicrosoftVisualStudioLanguageServerClientPackagesVersion>17.3.3101</MicrosoftVisualStudioLanguageServerClientPackagesVersion>

        <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.4.1004-preview</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>

        <MicrosoftVisualStudioShellPackagesVersion>17.3.32809.331</MicrosoftVisualStudioShellPackagesVersion>

        <MicrosoftVisualStudioShellPackagesVersion>17.4.32927.646</MicrosoftVisualStudioShellPackagesVersion>

        <RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>

        <!-- The version of Roslyn we build Source Generators against that are built in this

             repository. This must be lower than MicrosoftNetCompilersToolsetVersion,

             but not higher than our minimum dogfoodable Visual Studio version, or else

             the generators we build would load on the command line but not load in IDEs. -->

        <SourceGeneratorMicrosoftCodeAnalysisVersion>4.1.0</SourceGeneratorMicrosoftCodeAnalysisVersion>

        <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>

        <MicrosoftServiceHubVersion>4.0.2048</MicrosoftServiceHubVersion>

        <MicrosoftVisualStudioThreadingPackagesVersion>17.3.44</MicrosoftVisualStudioThreadingPackagesVersion>

        <MicrosoftServiceHubVersion>4.1.1</MicrosoftServiceHubVersion>

        <MicrosoftVisualStudioThreadingPackagesVersion>17.4.27</MicrosoftVisualStudioThreadingPackagesVersion>

        <MicrosoftTestPlatformVersion>17.4.0-preview-20220707-01</MicrosoftTestPlatformVersion>

      </PropertyGroup>

      <!--

    @@ -134,7 +134,7 @@
  
        <MicrosoftVisualStudioCacheVersion>17.2.41-alpha</MicrosoftVisualStudioCacheVersion>

        <MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.8.27812-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>

        <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>

        <MicrosoftVisualStudioComponentModelHostVersion>17.3.198</MicrosoftVisualStudioComponentModelHostVersion>

        <MicrosoftVisualStudioComponentModelHostVersion>17.4.248</MicrosoftVisualStudioComponentModelHostVersion>

        <MicrosoftVisualStudioCompositionVersion>16.9.20</MicrosoftVisualStudioCompositionVersion>

        <MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>

        <MicrosoftVisualStudioDebuggerUIInterfacesVersion>17.4.0-beta.22368.1</MicrosoftVisualStudioDebuggerUIInterfacesVersion>

    @@ -182,7 +182,7 @@
  
        <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>

        <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>

        <MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>

        <MicrosoftVisualStudioTelemetryVersion>16.4.137</MicrosoftVisualStudioTelemetryVersion>

        <MicrosoftVisualStudioTelemetryVersion>16.5.17</MicrosoftVisualStudioTelemetryVersion>

        <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>

        <MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>

        <MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>

    @@ -204,7 +204,7 @@
  
        <MDbgVersion>0.1.0</MDbgVersion>

        <MonoOptionsVersion>6.6.0.161</MonoOptionsVersion>

        <MoqVersion>4.10.1</MoqVersion>

        <NerdbankStreamsVersion>2.8.57</NerdbankStreamsVersion>

        <NerdbankStreamsVersion>2.9.109</NerdbankStreamsVersion>

        <NuGetVisualStudioVersion>6.0.0-preview.0.15</NuGetVisualStudioVersion>

        <NuGetSolutionRestoreManagerInteropVersion>4.8.0</NuGetSolutionRestoreManagerInteropVersion>

        <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>

    @@ -218,13 +218,13 @@
  
          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.3.0-rc.128</NuGetCommonVersion>

        <NuGetCommonVersion>6.4.0-preview.1.54</NuGetCommonVersion>

        <NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>

        <NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>

        <NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>

        <NuGetProtocolVersion>$(NuGetCommonVersion)</NuGetProtocolVersion>

        <NuGetVersioningVersion>$(NuGetCommonVersion)</NuGetVersioningVersion>

        <RoslynToolsVSIXExpInstallerVersion>1.1.0-beta3.21418.3</RoslynToolsVSIXExpInstallerVersion>

        <RoslynToolsVSIXExpInstallerVersion>1.1.0-beta3.22474.1</RoslynToolsVSIXExpInstallerVersion>

        <RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>

        <SourceBrowserVersion>1.0.21</SourceBrowserVersion>

        <SystemBuffersVersion>4.5.1</SystemBuffersVersion>

    @@ -240,7 +240,7 @@
  
        <SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>

        <SystemIOPipelinesVersion>6.0.3</SystemIOPipelinesVersion>

        <SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>

        <SystemMemoryVersion>4.5.4</SystemMemoryVersion>

        <SystemMemoryVersion>4.5.5</SystemMemoryVersion>

        <SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>

        <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>

        <SystemRuntimeInteropServicesNFloatInternalVersion>6.0.1</SystemRuntimeInteropServicesNFloatInternalVersion>

    @@ -284,7 +284,7 @@
  
          create a test insertion in Visual Studio to validate.

        -->

        <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>

        <StreamJsonRpcVersion>2.12.27</StreamJsonRpcVersion>

        <StreamJsonRpcVersion>2.13.33</StreamJsonRpcVersion>

        <!--

          When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they

          can update to the same version. Version changes require a VS test insertion for validation.

eng/common/build.ps1

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ Param( @@
       [string] $runtimeSourceFeed = '',
       [string] $runtimeSourceFeedKey = '',
       [switch] $excludePrereleaseVS,
+      [switch] $nativeToolsOnMachine,
       [switch] $help,
       [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
     )
@@ Expand Down Expand Up / @@ -67,6 +68,7 @@ function Print-Usage() { @@
       Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
       Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
       Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
+      Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
       Write-Host ""
       Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ Expand Down Expand Up / @@ -146,6 +148,9 @@ try { @@
         $nodeReuse = $false
       }
+      if ($nativeToolsOnMachine) {
+        $env:NativeToolsOnMachine = $true
+      }
       if ($restore) {
         InitializeNativeTools
       }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring release/vsmac17.4 up to release/dev17.4 #65650

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!