diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-04-17 11:53:29 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-04-17 11:53:29 +0300 |
| commit | bfbfc3f93276421a56300f89c4906bc992a0798e (patch) | |
| tree | 9c5cf287c52a52d987004f9b19456ddce0f04816 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj | |
| parent | 9477ac8fff7aa1b2043a2713ea01eafde15a4458 (diff) | |
| parent | a5ec5d754dd516dfadbb34fe1b167eff817ded6e (diff) | |
| download | Tango-bfbfc3f93276421a56300f89c4906bc992a0798e.tar.gz Tango-bfbfc3f93276421a56300f89c4906bc992a0798e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 42229544a..8d5b12d73 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -81,6 +81,7 @@ <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> + <Compile Include="ControlledObservableCollection.cs" /> <Compile Include="Controls\TimelineScrollViewer.cs" /> <Compile Include="Controls\TimeRuler.cs" /> <Compile Include="Converters\DateIsInListToBooleanConverter.cs" /> @@ -98,12 +99,16 @@ <Compile Include="Parsing\ILogFileParser.cs" /> <Compile Include="Parsing\LogFile.cs" /> <Compile Include="ViewModelLocator.cs" /> + <Compile Include="ViewModels\EmbeddedLogsViewVM.cs" /> <Compile Include="ViewModels\ApplicationLogsViewVM.cs" /> <Compile Include="ViewModels\EventDetailsViewVM.cs" /> <Compile Include="ViewModels\HomeViewVM.cs" /> <Compile Include="ViewModels\EventsViewVM.cs" /> <Compile Include="ViewModels\TimelineEventGroup.cs" /> <Compile Include="ViewModels\TimelineViewVM.cs" /> + <Compile Include="Views\EmbeddedLogsView.xaml.cs"> + <DependentUpon>EmbeddedLogsView.xaml</DependentUpon> + </Compile> <Compile Include="Views\EventDetailsView.xaml.cs"> <DependentUpon>EventDetailsView.xaml</DependentUpon> </Compile> @@ -197,6 +202,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <Page Include="Views\EmbeddedLogsView.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> <Page Include="Views\EventDetailsView.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> |