Skip to content

Commit

Permalink
Version update, adding a file exists check
Browse files Browse the repository at this point in the history
  • Loading branch information
humanarian committed Feb 23, 2024
1 parent 2ff0bec commit deec2cf
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 42 deletions.
6 changes: 3 additions & 3 deletions CS/EFCore/E965.Blazor.Server/E965.Blazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\E965.Module\E965.Module.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion CS/EFCore/E965.Module/BusinessObjects/E965DbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class E965DesignTimeDbContextFactory : IDesignTimeDbContextFactory<E965EF
public class E965EFCoreDbContext : DbContext {
public E965EFCoreDbContext(DbContextOptions<E965EFCoreDbContext> options) : base(options) {
}
//public DbSet<ModuleInfo> ModulesInfo { get; set; }
public DbSet<StandardFileDataDemo> StandardFileDataDemo { get; set; }
public DbSet<FileSystemLinkObjectDemo> FileSystemLinkObjectDemo { get; set; }
public DbSet<FileSystemStoreObjectDemo> FileSystemStoreObjectDemo { get; set; }

Expand Down
8 changes: 4 additions & 4 deletions CS/EFCore/E965.Module/E965.Module.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<EmbeddedResource Include="Model.DesignedDiffs.xafml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="23.2.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions CS/EFCore/E965.Win/E965.Win.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<EmbeddedResource Include="Images\Logo.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Win" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp.Win" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.Persistent.Base" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.RichEdit.Export" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.Win.Design" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Win" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Win" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.Base" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="23.2.4" />
<PackageReference Include="DevExpress.RichEdit.Export" Version="23.2.4" />
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\E965.Module\E965.Module.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public class FileSystemStoreObject : BaseObject, IFileData, IEmptyCheckable {
//Dennis: Fires when saving or opening a file.
void IFileData.SaveToStream(Stream destination) {
try {
if (!File.Exists(RealFileName)) {
return;
}
if (!string.IsNullOrEmpty(RealFileName)) {
if (destination == null)
FileSystemDataModule.OpenFileWithDefaultProgram(RealFileName);
Expand Down
4 changes: 2 additions & 2 deletions CS/EFCore/FileSystemData/FileSystemData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<EmbeddedResource Remove="bin\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="22.2.2-beta" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
6 changes: 3 additions & 3 deletions CS/XPO/E965/E965.Blazor.Server/E965.Blazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\E965.Module\E965.Module.csproj" />
Expand Down
12 changes: 6 additions & 6 deletions CS/XPO/E965/E965.Module/E965.Module.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<EmbeddedResource Include="Model.DesignedDiffs.xafml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.Persistent.Base" Version="23.1.6" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.Base" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FileSystemData\FileSystemData.csproj" />
Expand Down
20 changes: 10 additions & 10 deletions CS/XPO/E965/E965.Win/E965.Win.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
<EmbeddedResource Include="Images\ExpressAppLogo.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Win" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Win" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Win.Design" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.Persistent.Base" Version="23.1.6" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.RichEdit.Export" Version="23.1.6" />
<PackageReference Include="DevExpress.Win.Design" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.FileAttachment.Win" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Win" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Win.Design" Version="23.2.4" />
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.Base" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.2.4" />
<PackageReference Include="DevExpress.RichEdit.Export" Version="23.2.4" />
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\E965.Module\E965.Module.csproj" />
Expand Down
13 changes: 9 additions & 4 deletions CS/XPO/E965/FileSystemData/FileSystemData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@
<EmbeddedResource Remove="bin\**" />
<EmbeddedResource Remove="Properties\**" />
<None Remove="Properties\**" />
</ItemGroup>

<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="23.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.ExpressApp" Version="23.1.6" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.Xpo" Version="23.1.6" />
<PackageReference Include="DevExpress.ExpressApp" Version="23.2.4" />
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="23.2.4" />
<PackageReference Include="DevExpress.Xpo" Version="23.2.4" />
</ItemGroup>
</Project>

0 comments on commit deec2cf

Please sign in to comment.