Merged PR 20056: Merged PR 19701: Hotfix (0.4.216.3)

Publish Psi.Data package.
Fixed color scheme for AddAnnotation dialog.

Related work items: #37768

Sources/Data/Microsoft.Psi.Data/Microsoft.Psi.Data.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Windows/AddAnnotationWindow.xaml

@@ -10,31 +10,32 @@
         SizeToContent="WidthAndHeight"
         Title="Add Annotation"
         WindowStartupLocation="CenterOwner" 
-        WindowStyle="SingleBorderWindow">
+        WindowStyle="SingleBorderWindow"
+        Background="{StaticResource WindowBackgroundBrush}">
     
     <Grid Grid.IsSharedSizeScope="True">
         <Grid.Resources>
-            <Style TargetType="Label">
+            <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
                 <Setter Property="HorizontalAlignment" Value="Right" />
                 <Setter Property="Margin" Value="10,2,2,2" />
                 <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
 
-            <Style TargetType="TextBox">
+            <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Margin" Value="2,2,10,2" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Width" Value="180" />
             </Style>
 
-            <Style TargetType="ComboBox">
+            <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Margin" Value="2,2,10,2" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Width" Value="180" />
             </Style>
 
-            <Style TargetType="Button">
+            <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
                 <Setter Property="Height" Value="20" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Width" Value="80" />