#Кelease

This commit is contained in:
Alexander Mikhailov
2019-05-13 15:18:26 +03:00
parent a5a5eeb289
commit 40274f00c3
8 changed files with 222 additions and 236 deletions

View File

@@ -10,7 +10,7 @@
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<SignAssembly>true</SignAssembly>
<Configurations>Debug;DebugTest;Release;Debug;RemoteDebug</Configurations>
<Configurations>Debug;Release</Configurations>
<RootNamespace>DevExpress.DevAV</RootNamespace>
<AssemblyName>DevExpress.DevAV.v19.1.Data</AssemblyName>
</PropertyGroup>
@@ -59,7 +59,7 @@
<EmbeddedResource Include="Resources\Unknown-user.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview3.19153.1" />

View File

@@ -138,8 +138,8 @@
<EmbeddedResource Include="Sales\SalesInvoice.xltx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DevExpress.DevAV.Data\DevExpress.DevAV.Data.csproj" />

View File

@@ -12,35 +12,21 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
DebugTest|Any CPU = DebugTest|Any CPU
Release|Any CPU = Release|Any CPU
RemoteDebug|Any CPU = RemoteDebug|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.DebugTest|Any CPU.ActiveCfg = DebugTest|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.DebugTest|Any CPU.Build.0 = DebugTest|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Release|Any CPU.Build.0 = Release|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.RemoteDebug|Any CPU.ActiveCfg = RemoteDebug|Any CPU
{81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.RemoteDebug|Any CPU.Build.0 = RemoteDebug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Release|Any CPU.Build.0 = Release|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.RemoteDebug|Any CPU.ActiveCfg = Debug|Any CPU
{0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.RemoteDebug|Any CPU.Build.0 = Debug|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.DebugTest|Any CPU.ActiveCfg = DebugTest|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.DebugTest|Any CPU.Build.0 = DebugTest|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Release|Any CPU.Build.0 = Release|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.RemoteDebug|Any CPU.ActiveCfg = Debug|Any CPU
{3932816E-D0B4-08A9-2715-8D5B7DC201D8}.RemoteDebug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -4,7 +4,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>WinExe</OutputType>
<EnableDefaultItems>False</EnableDefaultItems>
<Configurations>Debug;Release;DebugTest</Configurations>
<Configurations>Debug;Release</Configurations>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<RootNamespace>DevExpress.DevAV</RootNamespace>
@@ -1237,9 +1237,9 @@
<EmbeddedResource Include="Resources\NewGroup.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Document.Processor" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3" />
<PackageReference Include="DevExpress.WindowsDesktop.Document.Processor" Version="19.1.3" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview3.19153.1" />

View File

@@ -60,7 +60,7 @@
ribbonControl.ApplicationDocumentCaption = customer.Name;
}
void UpdateChart(DevAV.MapItem salesItem) {
chart.Series[0].Colorizer = colorizer1;
chart.Series[0].View.Colorizer = colorizer1;
chart.DataSource = ViewModel.GetSalesByCity(salesItem.City, ViewModel.Period).ToList();
}
void UpdateColors() {

View File

@@ -61,7 +61,7 @@
ribbonControl.ApplicationDocumentCaption = product.Name;
}
void UpdateChart(DevAV.MapItem salesItem) {
chart.Series[0].Colorizer = keyColorColorizer as DevExpress.XtraCharts.IColorizer;
chart.Series[0].View.Colorizer = keyColorColorizer as DevExpress.XtraCharts.IColorizer;
chart.DataSource = ViewModel.GetSalesByCity(salesItem.City, ViewModel.Period).ToList();
}
void UpdateColors() {

View File

@@ -574,8 +574,8 @@
this.spreadsheetControl1.Location = new System.Drawing.Point(0, 141);
this.spreadsheetControl1.MenuManager = this.ribbonControl;
this.spreadsheetControl1.Name = "spreadsheetControl1";
this.spreadsheetControl1.Options.Import.Csv.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Csv.Encoding")));
this.spreadsheetControl1.Options.Import.Txt.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Txt.Encoding")));
//this.spreadsheetControl1.Options.Import.Csv.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Csv.Encoding")));
//this.spreadsheetControl1.Options.Import.Txt.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Txt.Encoding")));
this.spreadsheetControl1.Options.View.ShowColumnHeaders = false;
this.spreadsheetControl1.Options.View.ShowPrintArea = false;
this.spreadsheetControl1.Options.View.ShowRowHeaders = false;

View File

@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3-pre-19126" />
<PackageReference Include="DevExpress.WindowsDesktop.Core" Version="19.1.3" />
<PackageReference Include="DevExpress.WindowsDesktop.Win" Version="19.1.3" />
</ItemGroup>
<ItemGroup>