[repro/65feb67b-4509-44fb-a41a-6f17137e23e0] Source code updates from maestro-auth-test/nuget.client

src/nuget-client/.github/copilot-instructions.md

@@ -1,9 +1,15 @@
 # Instructions
 
-When creating pull requests, always follow the [PR template](PULL_REQUEST_TEMPLATE.md).
+## General Guidelines
 
-Use the following coding guidelines: https://github.com/NuGet/NuGet.Client/blob/dev/docs/coding-guidelines.md
+- When creating pull requests, always follow the [PR template](PULL_REQUEST_TEMPLATE.md).
+- Always format before submitting a pull request.
 
-Always format before submitting a pull request.
+## Coding Standards
 
-Never use reflection.
+- Use the following coding guidelines: https://github.com/NuGet/NuGet.Client/blob/dev/docs/coding-guidelines.md
+- Never use reflection.
+
+## Project-Specific Rules
+
+- All files in the repository are nullable by default (project-level nullable enable). No need to add `#nullable enable` directives to individual files.

src/nuget-client/build/config.props

@@ -13,7 +13,7 @@
     <!-- **  Change for each new version -->
     <!-- when changing any of the NuGetVersion props below, run tools-local\ship-public-apis -->
     <MajorNuGetVersion Condition="'$(MajorNuGetVersion)' == ''">7</MajorNuGetVersion>
-    <MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">5</MinorNuGetVersion>
+    <MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">6</MinorNuGetVersion>
     <PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">0</PatchNuGetVersion>
     <SemanticVersion Condition=" '$(SemanticVersion)' == '' ">$(MajorNuGetVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</SemanticVersion>
 

src/nuget-client/eng/pipelines/backup_build_artifacts.yml

@@ -12,7 +12,7 @@ jobs:
     displayName: "Backup Build Artifacts"
     timeoutInMinutes: 10
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEng-MicroBuildVSStable
 
     steps:
       - checkout: none

src/nuget-client/eng/pipelines/compliance.yml

@@ -21,7 +21,7 @@ extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
     sdl:
-      sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
+      sourceAnalysisPool: VSEng-MicroBuildVSStable
       binskim:
         enabled: true
         scanOutputDirectoryOnly: true
@@ -39,7 +39,7 @@ extends:
           notificationAliases: $(TsaNotificationAliases)
     pool:
       name: AzurePipelines-EO
-      image: VSEngSS-MicroBuild2022-1ES
+      image: VSEng-MicroBuildVSStable
       os: windows
     stages:
     - stage: compliance
@@ -49,7 +49,7 @@ extends:
         displayName: "Static Analysis"
         timeoutInMinutes: 180
         pool:
-          name: VSEngSS-MicroBuild2022-1ES
+          name: VSEng-MicroBuildVSStable
         templateContext:
           inputs:
             - input: pipelineArtifact

src/nuget-client/eng/pipelines/dailytests.yml

@@ -40,7 +40,7 @@ stages:
   - job: Build
     timeoutInMinutes: 170
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEng-MicroBuildVSStable
     steps:
     - template: vs-test/build.yml
 

src/nuget-client/eng/pipelines/official.yml

@@ -31,7 +31,7 @@ extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
     sdl:
-      sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
+      sourceAnalysisPool: VSEng-MicroBuildVSStable
       binskim:
         enabled: true
         scanOutputDirectoryOnly: true

src/nuget-client/eng/pipelines/pr.yml

@@ -62,7 +62,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Unit
         testTargetFramework: net472
 
@@ -79,7 +79,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Unit
         testTargetFramework: net10.0
 
@@ -96,7 +96,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSVSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net472
         testProjectName: Msbuild.Integration.Test
@@ -114,7 +114,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net472
         testProjectName: NuGet.CommandLine.FuncTest
@@ -133,7 +133,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net472
         testProjectName: NuGet.CommandLine.Test
@@ -153,7 +153,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net472
         testProjectName: NuGet.Packaging.FuncTest
@@ -171,7 +171,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net10.0
         testProjectName: Dotnet.Integration.Test
@@ -190,7 +190,7 @@ stages:
           agentPool: NetCore-Public
           agentDemands: ImageOverride -equals Windows.VS2022.Amd64.Open
         ${{ else }}:
-          agentPool: VSEngSS-MicroBuild2022-1ES
+          agentPool: VSEng-MicroBuildVSStable
         testType: Functional
         testTargetFramework: net10.0
         testProjectName: NuGet.Packaging.FuncTest

src/nuget-client/eng/pipelines/pull_request.yml

@@ -28,7 +28,7 @@ extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
     sdl:
-      sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
+      sourceAnalysisPool: VSEng-MicroBuildVSStable
       binskim:
         enabled: true
         scanOutputDirectoryOnly: true

src/nuget-client/eng/pipelines/templates/pipeline.yml

@@ -86,7 +86,7 @@ stages:
       RunSettingsDropName: 'RunSettings/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)'
       ProfilingInputsDropName: 'ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranch)/$(Build.BuildId)'
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEng-MicroBuildVSStable
     templateContext:
       mb:
         localization:
@@ -204,7 +204,7 @@ stages:
       VsTargetMajorVersion: $[stageDependencies.Initialize.Initialize_Build.outputs['updatebuildnumber.VsTargetMajorVersion']]
       BuildRTM: "true"
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEng-MicroBuildVSStable
     templateContext:
       mb:
         localization:

src/nuget-client/eng/pipelines/vs-tests.yml

@@ -72,7 +72,7 @@ stages:
   - job: Build
     timeoutInMinutes: 170
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEng-MicroBuildVSStable
     steps:
     - template: vs-test/build.yml
 

src/nuget-client/global.json

@@ -1,9 +1,4 @@
 {
-  "sdk": {
-    "version": "10.0.100",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
-  },
   "tools": {
     "dotnet": "10.0.100",
     "pinned": true

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Brushes.cs

@@ -172,6 +172,9 @@ public static class Brushes
 
         public static object ListItemTextSelectedColorKey { get; private set; } = SystemColors.HighlightTextColorKey;
 
+        public static object Environment122PercentFontSizeKey { get; private set; } = SystemFonts.MessageFontSizeKey;
+        public static object Environment155PercentFontSizeKey { get; private set; } = SystemFonts.MessageFontSizeKey;
+
         public static void LoadVsBrushes(INuGetExperimentationService nuGetExperimentationService)
         {
             if (nuGetExperimentationService == null)
@@ -181,6 +184,10 @@ public static void LoadVsBrushes(INuGetExperimentationService nuGetExperimentati
 
             bool isBgColorFlightEnabled = IsBackgroundColorFlightEnabled(nuGetExperimentationService);
 
+            // Maps to VS environment fonts. Used for larger headings.
+            Environment122PercentFontSizeKey = VsFonts.Environment122PercentFontSizeKey;
+            Environment155PercentFontSizeKey = VsFonts.Environment155PercentFontSizeKey;
+
             FocusVisualStyleBrushKey = VsBrushes.ToolWindowTextKey;
             ActiveBorderKey = VsBrushes.ActiveBorderKey;
             BorderBrush = VsBrushes.BrandedUIBorderKey;

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Resources.xaml

@@ -42,12 +42,6 @@
     x:Key="BooleanToHiddenVisibilityConverter" />
   <nuget:GreaterThanThresholdToVisibilityConverter
     x:Key="GreaterThanThresholdToVisibilityConverter" />
-  <nuget:FontSizeConverter
-    Scale="122"
-    x:Key="Font122PercentSizeConverter" />
-  <nuget:FontSizeConverter
-    Scale="155"
-    x:Key="Font155PercentSizeConverter" />
   <nuget:VersionToStringConverter
     x:Key="VersionToStringConverter" />
   <nuget:ProjectAndSolutionViewHeightConverter

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecationControl.xaml

@@ -7,6 +7,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
              xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+             xmlns:shell_controls="clr-namespace:Microsoft.VisualStudio.Shell.Controls;assembly=Microsoft.VisualStudio.Shell.Styles"
              mc:Ignorable="d"
              d:DesignHeight="150" d:DesignWidth="350">
   <UserControl.Resources>
@@ -35,7 +36,7 @@
             FontWeight="Bold"
             Text="{x:Static nuget:Resources.Label_Deprecated}"/>
         </StackPanel>
-        <TextBox
+        <shell_controls:TextBox
           Style="{DynamicResource SelectableTextBlockStyle}" 
           Margin="0,8,0,0"
           TextWrapping="WrapWithOverflow"

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DetailControl.xaml

@@ -8,6 +8,7 @@
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
   xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+  xmlns:shell_controls="clr-namespace:Microsoft.VisualStudio.Shell.Controls;assembly=Microsoft.VisualStudio.Shell.Styles"
   Background="{Binding UIBrushes.DetailPaneBackground }"
   x:Name="_self"
   mc:Ignorable="d"
@@ -66,13 +67,14 @@
             <ColumnDefinition Width="auto"/>
             <ColumnDefinition Width="auto"/>
           </Grid.ColumnDefinitions>
-          <TextBox
+          <shell_controls:TextBox
             Grid.Column="0"
             Name="_packageId"
             AutomationProperties.Name="{Binding Path=Id, Mode=OneWay}"
             Style="{DynamicResource SelectableTextBlockStyle}"
             Text="{Binding Path=Id, Mode=OneWay}"
-            FontSize="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font155PercentSizeConverter}}" />
+            FontSize="{DynamicResource {x:Static nuget:Brushes.Environment155PercentFontSizeKey}}"
+            ContextMenuOpening="OnContextMenuResetFontSize" />
           <imaging:CrispImage
             Grid.Column="1"
             x:Name="_prefixReservedMark"

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DetailControl.xaml.cs

@@ -211,5 +211,13 @@ private void ExecuteUserAction(UserAction action, NuGetActionType actionType)
                     }
                 });
         }
+
+        private void OnContextMenuResetFontSize(object sender, ContextMenuEventArgs e)
+        {
+            if (sender is System.Windows.Controls.TextBox textBox && textBox.ContextMenu != null)
+            {
+                textBox.ContextMenu.FontSize = FontSize;
+            }
+        }
     }
 }

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageDetailsTabControl.xaml

@@ -32,7 +32,7 @@
     <TabControl.Resources>
       <Style TargetType="TabItem">
         <Setter Property="Background" Value="{DynamicResource {x:Static nuget:Brushes.HeaderBackground}}" />
-        <Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource Font122PercentSizeConverter}}"/>
+        <Setter Property="FontSize" Value="{DynamicResource {x:Static nuget:Brushes.Environment122PercentFontSizeKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static nuget:Brushes.UIText}}" />
         <Setter Property="Padding" Value="12,0,12,0" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource ControlsFocusVisualStyle}" />

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageItemControl.xaml

@@ -175,7 +175,7 @@
                       Orientation="Horizontal">
           <TextBlock
                         FontWeight="Bold"
-                        FontSize="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}"
+                        FontSize="{DynamicResource {x:Static nuget:Brushes.Environment122PercentFontSizeKey}}"
                         TextWrapping="NoWrap"
                         VerticalAlignment="Top"
                         ToolTip="{x:Static nuget:Resources.ToolTip_PackageRecommended}"
@@ -184,7 +184,7 @@
                         Text="&#x2605; " />
           <TextBlock
                         FontWeight="Bold"
-                        FontSize="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}"
+                        FontSize="{DynamicResource {x:Static nuget:Brushes.Environment122PercentFontSizeKey}}"
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"
                         AutomationProperties.AutomationId="id"

src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml

@@ -41,7 +41,7 @@
         <TabControl.Resources>
           <Style TargetType="TabItem">
             <Setter Property="Background" Value="{DynamicResource {x:Static nuget:Brushes.HeaderBackground}}" />
-            <Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType=UserControl},Converter={StaticResource Font122PercentSizeConverter}}"/>
+            <Setter Property="FontSize" Value="{DynamicResource {x:Static nuget:Brushes.Environment122PercentFontSizeKey}}"/>
             <Setter Property="Foreground" Value="{DynamicResource {x:Static nuget:Brushes.UIText}}" />
             <Setter Property="Padding" Value="20,0,20,0" />
             <Setter Property="FocusVisualStyle" Value="{DynamicResource ControlsFocusVisualStyle}" />
@@ -171,7 +171,7 @@
         Grid.Column="4"
         HorizontalAlignment="Right"
         VerticalAlignment="Center"
-        FontSize="{Binding FontSize,RelativeSource={RelativeSource AncestorType=UserControl},Converter={StaticResource Font155PercentSizeConverter}}"
+        FontSize="{DynamicResource {x:Static nuget:Brushes.Environment155PercentFontSizeKey}}"
         Margin="20,0,0,0"
         TextTrimming="CharacterEllipsis">
         Package Manager