diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-07 17:27:00 +0300 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-07 17:27:00 +0300 |
| commit | f32bc5e5345f5386d4a82bc7270db79a0c7947ac (patch) | |
| tree | 642ce82fad40cc07adc53432cf83158f727b1f7b /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging | |
| parent | f6b0a945f86ee91cebd2d6726c06db93cdad0934 (diff) | |
| parent | eae70d7ebcb1007b407bac2ba27da5a5fef337db (diff) | |
| download | Tango-f32bc5e5345f5386d4a82bc7270db79a0c7947ac.tar.gz Tango-f32bc5e5345f5386d4a82bc7270db79a0c7947ac.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging')
2 files changed, 17 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.xaml new file mode 100644 index 000000000..70c42855b --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.xaml @@ -0,0 +1,12 @@ +<Application x:Class="Tango.MachineStudio.Logging.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" /> + <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" /> + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Application.Resources> +</Application> 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 c5af1bf96..4ef8888f1 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 @@ -194,6 +194,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <Page Include="App.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Views\EmbeddedLogDetailsView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -250,7 +254,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |