Fix chained item function empty result comparison in conditions

.config/git-merge-flow-config.jsonc

@@ -28,9 +28,9 @@
         },
         // Automate opening PRs to merge msbuild's vs18.0 (SDK 10.0.1xx) into vs18.3 (SDK 10.0.2xx, VS)
         "vs18.0": {
-            "MergeToBranch": "main" // update to flow through vs18.3 after we fork for release
+            "MergeToBranch": "vs18.3"
         },
-        // MSBuild latest release to main
+        // Automate opening PRs to merge msbuild's vs18.3 (SDK 10.0.2xx) into main
         "vs18.3": {
             "MergeToBranch": "main"
         }

.editorconfig

@@ -415,6 +415,12 @@ dotnet_diagnostic.IDE0301.severity = suggestion
 dotnet_diagnostic.IDE0305.severity = suggestion
 dotnet_diagnostic.IDE0306.severity = suggestion
 
+# Remove unnecessary nullable warning suppression
+dotnet_diagnostic.IDE0370.severity = suggestion
+
+# Remove unnecessary 'unsafe' modifier
+dotnet_diagnostic.IDE0380.severity = suggestion
+
 # Temporarily disable SA1010 "Opening square brackets should not be preceded by a space" until https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3687 is fixed
 dotnet_diagnostic.SA1010.severity = none
 

Directory.Packages.props

@@ -46,10 +46,8 @@
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
     <PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
-
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
   </ItemGroup>
 
 </Project>

NuGet.config

@@ -16,13 +16,11 @@
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet10" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet10/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
+    <add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
+    <add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
   </packageSources>
-  <!-- We don't want other than VS OpenTelemetry libraries from vs-impl -->
   <packageSourceMapping>
-    <packageSource key="vs-impl">
-      <package pattern="Microsoft.VisualStudio.OpenTelemetry*" />
-    </packageSource>
     <packageSource key="arcade">
       <package pattern="*" />
     </packageSource>
@@ -53,6 +51,12 @@
     <packageSource key="dotnet10-transport">
       <package pattern="*" />
     </packageSource>
+    <packageSource key="dotnet11">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet11-transport">
+      <package pattern="*" />
+    </packageSource>
   </packageSourceMapping>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

THIRDPARTYNOTICES.txt

@@ -43,33 +43,3 @@ Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 language governing permissions and limitations under the License.
-
--------------------------------
-
-Notice for OpenTelemetry .NET
--------------------------------
-MSBuild.exe is distributed with OpenTelemetry .NET binaries.
-
-Copyright (c) OpenTelemetry Authors
-Source:       https://github.com/open-telemetry/opentelemetry-dotnet
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
-
--------------------------------
-
-Notice for Microsoft.VisualStudio.OpenTelemetry.*
--------------------------------
-MSBuild.exe is distributed with Microsoft.VisualStudio.OpenTelemetry.* binaries.
-
-Project:      Microsoft.VisualStudio.OpenTelemetry
-Copyright:    (c) Microsoft Corporation
-License:      https://visualstudio.microsoft.com/license-terms/mt736442/

azure-pipelines/.vsts-dotnet-build-jobs.yml

@@ -29,7 +29,10 @@ jobs:
     - output: artifactsDrop
       sourcePath: '$(Build.SourcesDirectory)\artifacts\official\OptProf\$(BuildConfiguration)\Data'
       dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
-      dropMetadataContainerName: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
+      buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
+      toLowerCase: false
+      usePat: true
+      dropMetadataContainerName: 'DropMetadata-OptProf'
       condition: and(succeeded(), ${{ parameters.enableOptProf }})
 
     # Publish bootstrapper info for OptProf data collection run to consume

azure-pipelines/vs-insertion.yml

@@ -44,6 +44,7 @@ parameters:
     values:
       - auto
       - main
+      - rel/d18.4
       - rel/d18.3
       - rel/d18.0
       - rel/d17.14
@@ -67,7 +68,9 @@ parameters:
 variables:
   # `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
   - name: AutoInsertTargetBranch
-    ${{ if eq(variables['Build.SourceBranchName'], 'vs18.3') }}:
+    ${{ if eq(variables['Build.SourceBranchName'], 'vs18.4') }}:
+      value: 'rel/d18.4'
+    ${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.3') }}:
       value: 'rel/d18.3'
     ${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
       value: 'rel/d18.0'