diff --git a/.gitignore b/.gitignore index 456cdfa..b866a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.user *.userosscache *.sln.docstates +*.bak # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/CS/MinimalisticReportPreviewDemo.sln b/CS/DXSample.sln similarity index 58% rename from CS/MinimalisticReportPreviewDemo.sln rename to CS/DXSample.sln index c3431c2..46cd9e2 100644 --- a/CS/MinimalisticReportPreviewDemo.sln +++ b/CS/DXSample.sln @@ -1,6 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalisticReportPreviewDemo", "MinimalisticReportPreviewDemo\MinimalisticReportPreviewDemo.csproj", "{03842F9F-5A5D-4B93-9165-A9B9D325709C}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30611.23 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DXSample", "MinimalisticReportPreviewDemo\DXSample.csproj", "{03842F9F-5A5D-4B93-9165-A9B9D325709C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,4 +18,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F75CEC5A-6586-4DC0-9670-725B42DA34E0} + EndGlobalSection EndGlobal diff --git a/CS/MinimalisticReportPreviewDemo/App.xaml b/CS/MinimalisticReportPreviewDemo/App.xaml index f753f03..a9d1a25 100644 --- a/CS/MinimalisticReportPreviewDemo/App.xaml +++ b/CS/MinimalisticReportPreviewDemo/App.xaml @@ -1,4 +1,4 @@ - + diff --git a/CS/MinimalisticReportPreviewDemo/App.xaml.cs b/CS/MinimalisticReportPreviewDemo/App.xaml.cs index edff7d7..967f755 100644 --- a/CS/MinimalisticReportPreviewDemo/App.xaml.cs +++ b/CS/MinimalisticReportPreviewDemo/App.xaml.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Windows; -namespace MinimalisticReportPreviewDemo { +namespace DXSample { /// /// Interaction logic for App.xaml /// diff --git a/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj b/CS/MinimalisticReportPreviewDemo/DXSample.csproj similarity index 56% rename from CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj rename to CS/MinimalisticReportPreviewDemo/DXSample.csproj index 22444f5..733f05c 100644 --- a/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj +++ b/CS/MinimalisticReportPreviewDemo/DXSample.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 @@ -10,8 +10,9 @@ Properties MinimalisticReportPreviewDemo MinimalisticReportPreviewDemo - v4.0 - + v4.5.2 + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -26,6 +27,7 @@ prompt 4 true + false x86 @@ -35,52 +37,72 @@ TRACE prompt 4 + false - + False - + + False - + + False - + False - + False - + False - + False - + False - + False - + False - + False - - + False - + False - + + False - + + + False + + + False + + + + False + + + False + + + False + + False @@ -104,15 +126,12 @@ MSBuild:Compile Designer - - - True - True - nwindDataSet.xsd - - + Component + + XtraReport1.cs + MSBuild:Compile Designer @@ -127,6 +146,7 @@ + Code @@ -140,25 +160,15 @@ Settings.settings True + ResXFileCodeGenerator Resources.Designer.cs - - Report.cs + + XtraReport1.cs - - nwindDataSet.xsd - - - MSDataSetGenerator - nwindDataSet.Designer.cs - Designer - - - nwindDataSet.xsd - SettingsSingleFileGenerator Settings.Designer.cs @@ -178,4 +188,4 @@ --> - + \ No newline at end of file diff --git a/CS/MinimalisticReportPreviewDemo/MainWindow.xaml b/CS/MinimalisticReportPreviewDemo/MainWindow.xaml index 71147ee..c0cc6f0 100644 --- a/CS/MinimalisticReportPreviewDemo/MainWindow.xaml +++ b/CS/MinimalisticReportPreviewDemo/MainWindow.xaml @@ -1,8 +1,6 @@ - - -