Skip to content

Commit

Permalink
Rename PrismSerilogWpfDemo to PrismSerilogWpfDemoNet45
Browse files Browse the repository at this point in the history 
To give way for me to add a similar sample for .NET Core 3.0
  • Loading branch information
@augustoproiete
augustoproiete committed Oct 16, 2019
1 parent bd9bb47 commit 6b5a52b
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 28 deletions.
7 changes: 5 additions & 2 deletions prism-logging-serilog.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29201.188
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{2E38532A-A66C-498A-8FBF-4D6FE6F31ECC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSerilogWpfDemo", "sample\PrismSerilogWpfDemo\PrismSerilogWpfDemo.csproj", "{CB57A3B5-DDC6-48C3-B031-7216A83A2970}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSerilogWpfDemoNet45", "sample\net45\PrismSerilogWpfDemoNet45\PrismSerilogWpfDemoNet45.csproj", "{CB57A3B5-DDC6-48C3-B031-7216A83A2970}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A918D06F-30C4-48CA-8E75-90131BA4B8D8}"
EndProject
Expand All @@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2CB13D58-3
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Logging.Serilog.Tests", "test\Prism.Logging.Serilog.Tests\Prism.Logging.Serilog.Tests.csproj", "{49AF6C05-BB7C-437D-B163-813939457192}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net45", "net45", "{C8C51579-94E5-400E-914C-3616DBAEBF49}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -38,9 +40,10 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{CB57A3B5-DDC6-48C3-B031-7216A83A2970} = {2E38532A-A66C-498A-8FBF-4D6FE6F31ECC}
{CB57A3B5-DDC6-48C3-B031-7216A83A2970} = {C8C51579-94E5-400E-914C-3616DBAEBF49}
{88146B27-E104-4939-99FD-70557287F877} = {A918D06F-30C4-48CA-8E75-90131BA4B8D8}
{49AF6C05-BB7C-437D-B163-813939457192} = {2CB13D58-3C7B-4AAA-8ADD-F0C3CD52EEE4}
{C8C51579-94E5-400E-914C-3616DBAEBF49} = {2E38532A-A66C-498A-8FBF-4D6FE6F31ECC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7215B999-A555-49A3-ACCA-ABF01EE7C25B}
Expand Down
3 changes: 2 additions & 1 deletion prism-logging-serilog.sln.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MarkupAttributeTypo/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>
0 sample/PrismSerilogWpfDemo/App.config → ...net45/PrismSerilogWpfDemoNet45/App.config
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions sample/PrismSerilogWpfDemo/App.xaml → ...e/net45/PrismSerilogWpfDemoNet45/App.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<prism:PrismApplication x:Class="PrismSerilogWpfDemo.App"
<prism:PrismApplication x:Class="PrismSerilogWpfDemoNet45.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:prism="http://prismlibrary.com/"
xmlns:local="clr-namespace:PrismSerilogWpfDemo">
xmlns:local="clr-namespace:PrismSerilogWpfDemoNet45">
<Application.Resources>

</Application.Resources>
Expand Down
4 changes: 2 additions & 2 deletions sample/PrismSerilogWpfDemo/App.xaml.cs → ...et45/PrismSerilogWpfDemoNet45/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Windows;
using Prism.Ioc;
using Serilog;
using PrismSerilogWpfDemo.Views;
using PrismSerilogWpfDemoNet45.Views;

namespace PrismSerilogWpfDemo
namespace PrismSerilogWpfDemoNet45
{
public partial class App
{
Expand Down
24 changes: 12 additions & 12 deletions ...SerilogWpfDemo/PrismSerilogWpfDemo.csproj → ...DemoNet45/PrismSerilogWpfDemoNet45.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{CB57A3B5-DDC6-48C3-B031-7216A83A2970}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>PrismSerilogWpfDemo</RootNamespace>
<AssemblyName>PrismSerilogWpfDemo</AssemblyName>
<RootNamespace>PrismSerilogWpfDemoNet45</RootNamespace>
<AssemblyName>PrismSerilogWpfDemoNet45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down Expand Up @@ -35,38 +35,38 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
<HintPath>..\..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Prism, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\..\packages\Prism.Core.7.1.0.431\lib\net45\Prism.dll</HintPath>
<HintPath>..\..\..\packages\Prism.Core.7.1.0.431\lib\net45\Prism.dll</HintPath>
</Reference>
<Reference Include="Prism.Unity.Wpf, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\..\packages\Prism.Unity.7.1.0.431\lib\net45\Prism.Unity.Wpf.dll</HintPath>
<HintPath>..\..\..\packages\Prism.Unity.7.1.0.431\lib\net45\Prism.Unity.Wpf.dll</HintPath>
</Reference>
<Reference Include="Prism.Wpf, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\Prism.Wpf.dll</HintPath>
<HintPath>..\..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\Prism.Wpf.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\..\packages\Serilog.2.8.0\lib\net45\Serilog.dll</HintPath>
<HintPath>..\..\..\packages\Serilog.2.8.0\lib\net45\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
<HintPath>..\..\..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\System.Windows.Interactivity.dll</HintPath>
<HintPath>..\..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="Unity.Abstractions, Version=3.3.1.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.Abstractions.3.3.1\lib\net45\Unity.Abstractions.dll</HintPath>
<HintPath>..\..\..\packages\Unity.Abstractions.3.3.1\lib\net45\Unity.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Unity.Container, Version=5.8.11.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.Container.5.8.11\lib\net45\Unity.Container.dll</HintPath>
<HintPath>..\..\..\packages\Unity.Container.5.8.11\lib\net45\Unity.Container.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
Expand Down Expand Up @@ -119,7 +119,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Prism.Logging.Serilog\Prism.Logging.Serilog.csproj">
<ProjectReference Include="..\..\..\src\Prism.Logging.Serilog\Prism.Logging.Serilog.csproj">
<Project>{88146b27-e104-4939-99fd-70557287f877}</Project>
<Name>Prism.Logging.Serilog</Name>
</ProjectReference>
Expand Down
4 changes: 2 additions & 2 deletions ...SerilogWpfDemo/Properties/AssemblyInfo.cs → ...ogWpfDemoNet45/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using System.Runtime.InteropServices;
using System.Windows;

[assembly: AssemblyTitle("PrismSerilogWpfDemo")]
[assembly: AssemblyTitle("PrismSerilogWpfDemoNet45")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("caioproiete.net")]
[assembly: AssemblyProduct("PrismSerilogWpfDemo")]
[assembly: AssemblyProduct("PrismSerilogWpfDemoNet45")]
[assembly: AssemblyCopyright("Copyright © 2019 Caio Proiete and Contributors")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
2 changes: 1 addition & 1 deletion ...gWpfDemo/Properties/Resources.Designer.cs → ...emoNet45/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...mSerilogWpfDemo/Properties/Resources.resx → ...logWpfDemoNet45/Properties/Resources.resx
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ogWpfDemo/Properties/Settings.Designer.cs → ...DemoNet45/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...rilogWpfDemo/Properties/Settings.settings → ...WpfDemoNet45/Properties/Settings.settings
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...WpfDemo/ViewModels/MainWindowViewModel.cs → ...moNet45/ViewModels/MainWindowViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
using Prism.Logging;
using Prism.Mvvm;

namespace PrismSerilogWpfDemo.ViewModels
namespace PrismSerilogWpfDemoNet45.ViewModels
{
public class MainWindowViewModel : BindableBase
{
private readonly ILoggerFacade _logger;
private string _title = "Prism Serilog Demo";
private string _title = "Prism Serilog WPF Demo (.NET 4.5)";

public MainWindowViewModel(ILoggerFacade logger)
{
Expand Down
4 changes: 2 additions & 2 deletions ...PrismSerilogWpfDemo/Views/MainWindow.xaml → ...SerilogWpfDemoNet45/Views/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Window x:Class="PrismSerilogWpfDemo.Views.MainWindow"
<Window x:Class="PrismSerilogWpfDemoNet45.Views.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:local="clr-namespace:PrismSerilogWpfDemo"
xmlns:local="clr-namespace:PrismSerilogWpfDemoNet45"
Title="{Binding Title}" Height="490" Width="480"
WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow">
<Grid Margin="0 10 0 0">
Expand Down
2 changes: 1 addition & 1 deletion ...smSerilogWpfDemo/Views/MainWindow.xaml.cs → ...ilogWpfDemoNet45/Views/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Windows;

namespace PrismSerilogWpfDemo.Views
namespace PrismSerilogWpfDemoNet45.Views
{
public partial class MainWindow : Window
{
Expand Down
0 sample/PrismSerilogWpfDemo/packages.config → .../PrismSerilogWpfDemoNet45/packages.config
View file
File renamed without changes.

0 comments on commit 6b5a52b

Please sign in to comment.