Additional changes

Author: StanleyGoldman

src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs

@@ -3,6 +3,8 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
+using GitHub.InlineReviews.ViewModels;
+using GitHub.Models;
 using GitHub.ViewModels;
 using ReactiveUI;
 

…ata/InlineAnnotationViewModelDesigner.cs …ata/InlineAnnotationViewModelDesigner.cssrc/GitHub.InlineReviews/SampleData/InlineAnnotationViewModelDesigner.cs renamed to src/GitHub.App/SampleData/InlineAnnotationViewModelDesigner.cs src/GitHub.InlineReviews/SampleData/InlineAnnotationViewModelDesigner.cs renamed to src/GitHub.App/SampleData/InlineAnnotationViewModelDesigner.cs

@@ -3,7 +3,7 @@
 using GitHub.Models;
 using GitHub.ViewModels;
 
-namespace GitHub.InlineReviews.SampleData
+namespace GitHub.SampleData
 {
     public class InlineAnnotationViewModelDesigner : IInlineAnnotationViewModel
     {

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -81,7 +81,6 @@
     <Compile Include="Margins\InlineCommentMargin.cs" />
     <Compile Include="Margins\InlineCommentMarginVisible.cs" />
     <Compile Include="Margins\InlineCommentMarginEnabled.cs" />
-    <Compile Include="SampleData\InlineAnnotationViewModelDesigner.cs" />
     <Compile Include="PullRequestStatusBarPackage.cs" />
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />
@@ -117,9 +116,6 @@
     <Compile Include="ViewModels\NewInlineCommentThreadViewModel.cs" />
     <Compile Include="ViewModels\PullRequestReviewCommentViewModel.cs" />
     <Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
-    <Compile Include="Views\InlineAnnotationView.xaml.cs">
-      <DependentUpon>InlineAnnotationView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\PullRequestFileMarginView.xaml.cs">
       <DependentUpon>PullRequestFileMarginView.xaml</DependentUpon>
     </Compile>
@@ -432,10 +428,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\InlineAnnotationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\PullRequestFileMarginView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml

@@ -14,7 +14,7 @@
         <ItemsControl ItemsSource="{Binding Annotations}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <local:InlineAnnotationView Margin="0 4"/>
+                    <local:InlineAnnotationView />
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>

…eReviews/Views/InlineAnnotationView.xaml …tudio.UI/Views/InlineAnnotationView.xamlsrc/GitHub.InlineReviews/Views/InlineAnnotationView.xaml renamed to src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml src/GitHub.InlineReviews/Views/InlineAnnotationView.xaml renamed to src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml

@@ -1,16 +1,15 @@
-<UserControl x:Class="GitHub.InlineReviews.Views.InlineAnnotationView"
+<UserControl x:Class="GitHub.VisualStudio.Views.InlineAnnotationView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:GitHub.InlineReviews.Views"
-             xmlns:sample="clr-namespace:GitHub.InlineReviews.SampleData"
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
+             xmlns:sampleData="clr-namespace:GitHub.InlineReviews.SampleData;assembly=GitHub.InlineReviews"
              mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
 
     <d:DesignProperties.DataContext>
-        <sample:InlineAnnotationViewModelDesigner />
+        <sampleData:InlineAnnotationViewModelDesigner />
     </d:DesignProperties.DataContext>
 
     <StackPanel Orientation="Vertical">

…views/Views/InlineAnnotationView.xaml.cs …io.UI/Views/InlineAnnotationView.xaml.cssrc/GitHub.InlineReviews/Views/InlineAnnotationView.xaml.cs renamed to src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml.cs src/GitHub.InlineReviews/Views/InlineAnnotationView.xaml.cs renamed to src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml.cs

@@ -2,7 +2,7 @@
 using System.Windows.Controls;
 using GitHub.VisualStudio.UI.Helpers;
 
-namespace GitHub.InlineReviews.Views
+namespace GitHub.VisualStudio.Views
 {
     public partial class InlineAnnotationView : UserControl
     {