From 781d32638b0e93b4964f7a60e9bfbdad764ab563 Mon Sep 17 00:00:00 2001
From: Nick Saw <chitsaw@microsoft.com>
Date: Wed, 18 Jul 2018 01:21:18 +0000
Subject: [PATCH] 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
---
 Directory.Build.props                         | Bin 2138 -> 2138 bytes
 .../KinectSample/Properties/AssemblyInfo.cs   | Bin 1278 -> 1278 bytes
 .../OpenCVSample.Interop/AssemblyInfo.cpp     | Bin 1748 -> 1748 bytes
 .../OpenCVSample/Properties/AssemblyInfo.cs   | Bin 1406 -> 1406 bytes
 .../SpeechSample/Properties/AssemblyInfo.cs   | Bin 1278 -> 1278 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1290 -> 1290 bytes
 Samples/WpfSample/Properties/AssemblyInfo.cs  | Bin 1406 -> 1406 bytes
 .../Microsoft.Psi.Data.csproj                 |  79 +++++++++---------
 .../Properties/AssemblyInfo.cs                | Bin 1326 -> 1326 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1394 -> 1394 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1322 -> 1322 bytes
 .../AssemblyInfo.cpp                          | Bin 1820 -> 1820 bytes
 .../AssemblyInfo.rc                           | Bin 5104 -> 5104 bytes
 .../Properties/AssemblyInfo.cs                | Bin 3394 -> 3394 bytes
 .../AssemblyInfo.cpp                          | Bin 3032 -> 3032 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1294 -> 1294 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1474 -> 1474 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1322 -> 1322 bytes
 .../Windows/AddAnnotationWindow.xaml          |  11 +--
 .../Properties/AssemblyInfo.cs                | Bin 1304 -> 1304 bytes
 .../Properties/AssemblyInfo.cs                | Bin 1320 -> 1320 bytes
 21 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a1c1131522dfce693ae6150fc82483482171afa6..6438f640795c0ff858a29fbb1ac913384a6455af 100644
GIT binary patch
delta 26
icmca5a7$oA3KOd_gAIfJWI<;6$?up1HqT%>#0mgyf(QEm

delta 26
icmca5a7$oA3KOdlgAIfJWI<;6$?up1HqT%>#0mgya0mJT

diff --git a/Samples/KinectSample/Properties/AssemblyInfo.cs b/Samples/KinectSample/Properties/AssemblyInfo.cs
index 0d0ed5192b793d6792341db5780aa8d72b2c4df7..f49690e724eac5ffac7ba6759f6b7219a01af43a 100644
GIT binary patch
delta 50
zcmeyz`Hyph91ElI<U}UJ$pI`{P}Uk28!=-BU4|rvRE83UL<S`WO@>$oUIs1(0ADK#
A_y7O^

delta 50
zcmeyz`Hyph91Ek-<U}UJ$pI`{P}Uk28!;mWU4|rvRE83UL<S`WO@>$oUIs1(0A9-q
A^#A|>

diff --git a/Samples/OpenCVSample/OpenCVSample.Interop/AssemblyInfo.cpp b/Samples/OpenCVSample/OpenCVSample.Interop/AssemblyInfo.cpp
index 058f5f517c5d9496cd90a60c16e8dab46f773edb..d634b4246cee7987891df63f86e1421a05db1669 100644
GIT binary patch
delta 33
icmcb@dxdv{9V?^pWI<-b$px%7P}V(GKOjq&Z8-p@=LvTJ

delta 33
icmcb@dxdv{9V?^JWI<-b$px%7P}V(GKOjq&Z8-p@x(Rdu

diff --git a/Samples/OpenCVSample/OpenCVSample/Properties/AssemblyInfo.cs b/Samples/OpenCVSample/OpenCVSample/Properties/AssemblyInfo.cs
index 1e19aad9c2675dcce26105422c455b97fd2dadd4..1b00f7bef9d71a4faa88e065cf6331a1ab50d9c2 100644
GIT binary patch
delta 46
zcmeyz^^a@AJQhad$@5vFfn-0E;ba|F8!=-BU4|rvRE83UL<S`WO@>$oUIs1(07HWc
Af&c&j

delta 46
zcmeyz^^a@AJQhZy$@5vFfn-0E;ba|F8!;mWU4|rvRE83UL<S`WO@>$oUIs1(07EAV
Ae*gdg

diff --git a/Samples/SpeechSample/Properties/AssemblyInfo.cs b/Samples/SpeechSample/Properties/AssemblyInfo.cs
index 0aa3a18e09eb8ed27fd34bafc0bdd38f89564a2f..060b9d98dd742a8c6fb491ef936f188915d9fe7c 100644
GIT binary patch
delta 50
zcmeyz`Hyph91ElI<U}UJ$pI`{P}Uk28!=-BU4|rvRE83UL<S`WO@>$oUIs1(0ADK#
A_y7O^

delta 50
zcmeyz`Hyph91Ek-<U}UJ$pI`{P}Uk28!;mWU4|rvRE83UL<S`WO@>$oUIs1(0A9-q
A^#A|>

diff --git a/Samples/WebcamWithAudioSample/Properties/AssemblyInfo.cs b/Samples/WebcamWithAudioSample/Properties/AssemblyInfo.cs
index 12c60e43197a53df27536ab613d0a3728a4f31c7..f6ef22e8b951eee8415166925b1204c14e63c37b 100644
GIT binary patch
delta 50
zcmeC;>f+j<#lmPjc_E|W<QNt$C~F6cjhHcmE<+MSDnkiFB7+ixCPOR(F9R0?07+vC
Av;Y7A

delta 50
zcmeC;>f+j<#lmPbc_E|W<QNt$C~F6cjhGRGE<+MSDnkiFB7+ixCPOR(F9R0?07(N1
Au>b%7

diff --git a/Samples/WpfSample/Properties/AssemblyInfo.cs b/Samples/WpfSample/Properties/AssemblyInfo.cs
index fa96fc227e50b4f989e58aec8dc56d8687c126f3..7272a2fb376f0ddf75144c9798e6d03f44b3c654 100644
GIT binary patch
delta 46
zcmeyz^^a@AJQhad$@5vFfn-0E;ba|F8!=-BU4|rvRE83UL<S`WO@>$oUIs1(07HWc
Af&c&j

delta 46
zcmeyz^^a@AJQhZy$@5vFfn-0E;ba|F8!;mWU4|rvRE83UL<S`WO@>$oUIs1(07EAV
Ae*gdg

diff --git a/Sources/Data/Microsoft.Psi.Data/Microsoft.Psi.Data.csproj b/Sources/Data/Microsoft.Psi.Data/Microsoft.Psi.Data.csproj
index 7e574ea9..1e1ca2ca 100644
--- a/Sources/Data/Microsoft.Psi.Data/Microsoft.Psi.Data.csproj
+++ b/Sources/Data/Microsoft.Psi.Data/Microsoft.Psi.Data.csproj
@@ -1,39 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\netstandard2.0\Microsoft.Psi.Data.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>../../../Build/Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\Microsoft.Psi.Data.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>../../../Build/Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AdditionalFiles Include="stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.9" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Runtime\Microsoft.Psi\Microsoft.Psi.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.0\Microsoft.Psi.Data.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>../../../Build/Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\Microsoft.Psi.Data.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>../../../Build/Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
+    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Runtime\Microsoft.Psi\Microsoft.Psi.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Imaging/Test.Psi.Imaging.Windows/Properties/AssemblyInfo.cs b/Sources/Imaging/Test.Psi.Imaging.Windows/Properties/AssemblyInfo.cs
index e9f448b9602ff9dbe1a394f07282ea294fdae7d1..c3f22457316783859423e530103d3702b50f82d0 100644
GIT binary patch
delta 50
zcmZ3-wT^3p9}A=L<cUm%lN(sHpsYJAHe$vMx(rDSsSG6yi3~~%nhdcFybN3n0Ad>p
AN&o-=

delta 50
zcmZ3-wT^3p9}A<=<cUm%lN(sHpsYJAHeyB$x(rDSsSG6yi3~~%nhdcFybN3n0Aafe
AM*si-

diff --git a/Sources/Integrations/CognitiveServices/Test.Psi.CognitiveServices.Vision.Windows/Properties/AssemblyInfo.cs b/Sources/Integrations/CognitiveServices/Test.Psi.CognitiveServices.Vision.Windows/Properties/AssemblyInfo.cs
index 1f533c049fd538901d839e0457a6b9495deb8165..524168eeb5495359ae2e0d9d272a8af14351fc86 100644
GIT binary patch
delta 46
zcmeyw^@(f4Bo;>F$@VOUlaH`y0a@=^a>a}pbQzKuQW;7Z5*d^jG#O$Ucp11D07`xe
A_W%F@

delta 46
zcmeyw^@(f4Bo;=a$@VOUlaH`y0a@=^a>a}obQzKuQW;7Z5*d^jG#O$Ucp11D07@nb
A^Z)<=

diff --git a/Sources/Kinect/Test.Psi.Kinect.Windows.x64/Properties/AssemblyInfo.cs b/Sources/Kinect/Test.Psi.Kinect.Windows.x64/Properties/AssemblyInfo.cs
index f656a336953a02d18740b49b8f79f21b608b7b33..398cedd0fae6aa971ded77731c5379765289ad02 100644
GIT binary patch
delta 50
zcmZ3*wTf$l7Yn2D<c*AmlWSPCpsX7#He$vMx(rDSsSG6yi3~~%nhdcFybN3n0B2(h
AbN~PV

delta 50
zcmZ3*wTf$l7Yn1&<c*AmlWSPCpsX7#HeyB$x(rDSsSG6yi3~~%nhdcFybN3n0A~XW
AaR2}S

diff --git a/Sources/Media/Microsoft.Psi.Media_Interop.Windows.x64/AssemblyInfo.cpp b/Sources/Media/Microsoft.Psi.Media_Interop.Windows.x64/AssemblyInfo.cpp
index cdf491a068582f9332cf51941179ac9db995d0c0..e3a93a9159f8d823f8285377acfeece0a53da172 100644
GIT binary patch
delta 60
zcmbQkH-~S77#pMUWJOlR$-9^YCVQ~iAn~@b`AHZv=rSZRq%xE+Br+&5XfnhySTpc4
Ha4`S?%>fL<

delta 60
zcmbQkH-~S77#pL}WJOlR$-9^YCVQ~iAn~@b`AHZt=rSZRq%xE+Br+&5XfnhySTpc4
Ha4`S?%#RGf

diff --git a/Sources/Media/Microsoft.Psi.Media_Interop.Windows.x64/AssemblyInfo.rc b/Sources/Media/Microsoft.Psi.Media_Interop.Windows.x64/AssemblyInfo.rc
index 55b0a0618a3a9446ffefd9a4dbe397bc1f8997b1..adce49d6b4b22256a538c5c822bc74c668639019 100644
GIT binary patch
delta 24
gcmeyM{y}|11qY+?WJ3<)$!j=d7>zfd<WT1Z0C4&T-v9sr

delta 24
gcmeyM{y}|11qY+iWJ3<)$!j=d7>zcc<WT1Z0C407-2eap

diff --git a/Sources/RealSense/Microsoft.Psi.RealSense.Windows.x64/Properties/AssemblyInfo.cs b/Sources/RealSense/Microsoft.Psi.RealSense.Windows.x64/Properties/AssemblyInfo.cs
index d449efeeb82d4060b757b2b8c6e985e44fbb00d4..62c573fa4b8f127a7204f5d53302fa760b8ae49a 100644
GIT binary patch
delta 50
zcmX>kbx3MM5)Y&CWJOlP$y0c=psWu(He$vMx(rDSsSG6yi3~~%nhdcFybN3n09}g<
A3;+NC

delta 50
zcmX>kbx3MM5)Y%%WJOlP$y0c=psWu(HeyB$x(rDSsSG6yi3~~%nhdcFybN3n09`8!
A2><{9

diff --git a/Sources/RealSense/Microsoft.Psi.RealSense_Interop.Windows.x64/AssemblyInfo.cpp b/Sources/RealSense/Microsoft.Psi.RealSense_Interop.Windows.x64/AssemblyInfo.cpp
index dc5118de9585da59ffc13177b1ed3e02ea99ba81..dc5917c091a4e068889b910c132172e174533334 100644
GIT binary patch
delta 33
icmca1enWhN6&IuN<iD(jlXJLipsZV5en6Hc_j&-!_6vIe

delta 33
icmca1enWhN6&It?<iD(jlXJLipsZV5en6Hc_j&-!$qRS@

diff --git a/Sources/Runtime/Test.Psi.Windows/Properties/AssemblyInfo.cs b/Sources/Runtime/Test.Psi.Windows/Properties/AssemblyInfo.cs
index e13ac7341ed28a26cd0ebc3b5b17889cc546ad69..7a0b3655b3742a4ef8c5c62e1693336ead23e53e 100644
GIT binary patch
delta 50
zcmeC<>f_p=$HHhlxsb_lasrDMl(mP&M$DK&mm!HEm7#<okwJ+;lOdLYmw}4`06)75
AY5)KL

delta 50
zcmeC<>f_p=$HHhdxsb_lasrDMl(mP&M$Cvomm!HEm7#<okwJ+;lOdLYmw}4`06$v_
AX8-^I

diff --git a/Sources/Speech/Test.Psi.Speech.Windows/Properties/AssemblyInfo.cs b/Sources/Speech/Test.Psi.Speech.Windows/Properties/AssemblyInfo.cs
index 3fc7151a9cb5d39c5317979a487d38782af4f66d..0edd70357c27caf7076f7bceac7dfde4cc028164 100644
GIT binary patch
delta 50
zcmX@aeTaL*BNj&E$r~9BCyTIZL0JW?He$vMx(rDSsSG6yi3~~%nhdcFybN3n0CKkr
AZ~y=R

delta 50
zcmX@aeTaL*BNj%Z$r~9BCyTIZL0JW?HeyB$x(rDSsSG6yi3~~%nhdcFybN3n0CHCg
AZ2$lO

diff --git a/Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Properties/AssemblyInfo.cs b/Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Properties/AssemblyInfo.cs
index a88dc67cdf8e3620814775c36f7a25591c0657b8..b397ed2d2b969420c9e3b8e87570d5956c4fbfee 100644
GIT binary patch
delta 50
zcmZ3*wTf$l7Yn2D<c*AmlWSPCpsX7#He$vMx(rDSsSG6yi3~~%nhdcFybN3n0B2(h
AbN~PV

delta 50
zcmZ3*wTf$l7Yn1&<c*AmlWSPCpsX7#HeyB$x(rDSsSG6yi3~~%nhdcFybN3n0A~XW
AaR2}S

diff --git a/Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Windows/AddAnnotationWindow.xaml b/Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Windows/AddAnnotationWindow.xaml
index 5ff2f7d6..0eba866a 100644
--- a/Sources/Tools/PsiStudio/Microsoft.Psi.PsiStudio/Windows/AddAnnotationWindow.xaml
+++ b/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" />
diff --git a/Sources/Tools/PsiStudio/Test.Psi.PsiStudio/Properties/AssemblyInfo.cs b/Sources/Tools/PsiStudio/Test.Psi.PsiStudio/Properties/AssemblyInfo.cs
index 696e7de168d59167ed6b032be6149833ba372bec..0af1dade9abb13cbd5878e7a267cb2205ca70cb3 100644
GIT binary patch
delta 50
zcmbQiHG^w|1q-9`WL_r2$yqE~P}VUP8!=-BU4|rvRE83UL<S`WO@>$oUIs1(04!w*
A)Bpeg

delta 50
zcmbQiHG^w|1q-9mWL_r2$yqE~P}VUP8!;mWU4|rvRE83UL<S`WO@>$oUIs1(04xOw
A(EtDd

diff --git a/Sources/Visualization/Test.Psi.Visualization/Properties/AssemblyInfo.cs b/Sources/Visualization/Test.Psi.Visualization/Properties/AssemblyInfo.cs
index a2432ddad720ad0752517056c521c974ad5c4dbc..19ec8cdc5da85e426fa1bad86722f89e957cde8a 100644
GIT binary patch
delta 50
zcmZ3%wSsGd2MeR|<n@e(ldD*?psZ^wHe$vMx(rDSsSG6yi3~~%nhdcFybN3n0A)Q3
AW&i*H

delta 50
zcmZ3%wSsGd2MeRo<n@e(ldD*?psZ^wHeyB$x(rDSsSG6yi3~~%nhdcFybN3n0A$?@
AV*mgE