Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV: Origam.Service.Core updated to 2.1.4 #2227

Merged
merged 6 commits into from
Nov 23, 2023
Merged

DEV: Origam.Service.Core updated to 2.1.4 #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c00c9c
Origam.Service.Core updated to 2.1.4
JindrichSusen Nov 21, 2023
93479da
Revert "Origam.Service.Core updated to 2.1.4"
JindrichSusen Nov 21, 2023
4c11644
Origam.Service.Core.dll updated
JindrichSusen Nov 21, 2023
32517f6
References added back
JindrichSusen Nov 21, 2023
dbdb139
References added back
JindrichSusen Nov 21, 2023
f9e2955
Project encoding changed to utf-8
JindrichSusen Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
443 changes: 221 additions & 222 deletions backend/Origam.BI.CrystalReports.NetFx/Origam.BI.CrystalReports.NetFx.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backend/Origam.BI.Excel/Origam.BI.Excel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NPOI" Version="2.6.2" />
<PackageReference Include="Origam.Service.Core" Version="2.1.3" />
<PackageReference Include="Origam.Service.Core" Version="2.1.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Origam.Workbench.Services\Origam.Workbench.Services.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion backend/Origam.BI.FastReport/Origam.BI.FastReport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<ItemGroup>
<PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="2023.3.12" />
<PackageReference Include="Origam.Service.Core" Version="2.1.3" />
<PackageReference Include="Origam.Service.Core" Version="2.1.4" />
</ItemGroup>

<ItemGroup>
Expand Down
303 changes: 151 additions & 152 deletions backend/Origam.BI.PrintIt/Origam.BI.PrintIt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,153 +1,152 @@
<?xml version="1.0" encoding="utf-16"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>7.10.6030</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{65CCC71C-287F-47C2-9B37-F1ECEFADC327}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon />
<AssemblyKeyContainerName />
<AssemblyName>Origam.BI.PrintIt</AssemblyName>
<AssemblyOriginatorKeyFile />
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>Origam.BI.PrintIt</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject />
<FileUpgradeFlags>
</FileUpgradeFlags>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OldToolsVersion>0.0</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<LangVersion>10</LangVersion>
</PropertyGroup>
<PropertyGroup>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">NETSTANDARD;NETSTANDARD2_0</DefineConstants>
<Configurations>Debug Client;Debug Architect;Debug Server;Release Client;Release Architect;Release Server</Configurations>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Client|AnyCPU' ">
<DefineConstants>ORIGAM_CLIENT;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Client|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;ORIGAM_CLIENT;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Server|AnyCPU' ">
<DefineConstants>ORIGAM_CLIENT;ORIGAM_SERVER;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Server|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;ORIGAM_CLIENT;ORIGAM_SERVER;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Architect|AnyCPU' ">
<DefineConstants>$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Architect|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Origam.BI\Origam.BI.csproj">
<Name>Origam.BI</Name>
<Project>{54BFF654-2A00-4A8A-86B0-06F124D769A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.Common.Nonstd\Origam.Common.NetFX.csproj">
<Project>{84251d2b-43a4-4228-8d2a-8729722c25e4}</Project>
<Name>Origam.Common.NetFX</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Common\Origam.Common.csproj">
<Project>{3c49f590-14ac-464d-b0f9-8738576249a9}</Project>
<Name>Origam.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.DA.Common\Origam.DA.Common.csproj">
<Name>Origam.DA.Common</Name>
<Project>{B4E4DC00-766A-4CA3-83D8-0A5383462F53}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.Rule\Origam.Rule.csproj">
<Project>{4F05DB44-2BBD-4B54-8D37-E8038D1EE1E7}</Project>
<Name>Origam.Rule</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema.EntityModel\Origam.Schema.EntityModel.csproj">
<Project>{FDF55D1B-BB0D-4191-AE53-98DE5A4465B5}</Project>
<Name>Origam.Schema.EntityModel</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema.GuiModel\Origam.Schema.GuiModel.csproj">
<Name>Origam.Schema.GuiModel</Name>
<Project>{ECFF4A9D-9196-4962-823C-A65D552FF6D8}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema\Origam.Schema.csproj">
<Project>{976f3aba-938d-4242-a93b-7d7a1861a66e}</Project>
<Name>Origam.Schema</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Services\Origam.Services.csproj">
<Name>Origam.Services</Name>
<Project>{199DDE99-9EE7-4CCE-B71D-7FC1CC0896AA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.UI.Common\Origam.UI.Common.csproj">
<Name>Origam.UI.Common</Name>
<Project>{EF5DE64E-88B2-4B0A-BB7F-4A537B56F3D1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.XML">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="PrintItService.cs">
<SubType>Code</SubType>
</Compile>
<EmbeddedResource Include="Strings.resx">
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Origam.Service.Core">
<Version>2.1.3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets">
</Import>
<PropertyGroup>
<PreBuildEvent />
<PostBuildEvent />
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>7.10.6030</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{65CCC71C-287F-47C2-9B37-F1ECEFADC327}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon />
<AssemblyKeyContainerName />
<AssemblyName>Origam.BI.PrintIt</AssemblyName>
<AssemblyOriginatorKeyFile />
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>Origam.BI.PrintIt</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject />
<FileUpgradeFlags>
</FileUpgradeFlags>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OldToolsVersion>0.0</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<LangVersion>10</LangVersion>
</PropertyGroup>
<PropertyGroup>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">NETSTANDARD;NETSTANDARD2_0</DefineConstants>
<Configurations>Debug Client;Debug Architect;Debug Server;Release Client;Release Architect;Release Server</Configurations>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Client|AnyCPU' ">
<DefineConstants>ORIGAM_CLIENT;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Client|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;ORIGAM_CLIENT;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Server|AnyCPU' ">
<DefineConstants>ORIGAM_CLIENT;ORIGAM_SERVER;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Server|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;ORIGAM_CLIENT;ORIGAM_SERVER;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Architect|AnyCPU' ">
<DefineConstants>$(DefineConstants)</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Architect|AnyCPU' ">
<DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Origam.BI\Origam.BI.csproj">
<Project>{54bff654-2a00-4a8a-86b0-06f124d769a1}</Project>
<Name>Origam.BI</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Common.Nonstd\Origam.Common.NetFX.csproj">
<Project>{84251d2b-43a4-4228-8d2a-8729722c25e4}</Project>
<Name>Origam.Common.NetFX</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Common\Origam.Common.csproj">
<Project>{3c49f590-14ac-464d-b0f9-8738576249a9}</Project>
<Name>Origam.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.DA.Common\Origam.DA.Common.csproj">
<Name>Origam.DA.Common</Name>
<Project>{B4E4DC00-766A-4CA3-83D8-0A5383462F53}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.Rule\Origam.Rule.csproj">
<Project>{4F05DB44-2BBD-4B54-8D37-E8038D1EE1E7}</Project>
<Name>Origam.Rule</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema.EntityModel\Origam.Schema.EntityModel.csproj">
<Project>{FDF55D1B-BB0D-4191-AE53-98DE5A4465B5}</Project>
<Name>Origam.Schema.EntityModel</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema.GuiModel\Origam.Schema.GuiModel.csproj">
<Name>Origam.Schema.GuiModel</Name>
<Project>{ECFF4A9D-9196-4962-823C-A65D552FF6D8}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.Schema\Origam.Schema.csproj">
<Project>{976f3aba-938d-4242-a93b-7d7a1861a66e}</Project>
<Name>Origam.Schema</Name>
</ProjectReference>
<ProjectReference Include="..\Origam.Services\Origam.Services.csproj">
<Name>Origam.Services</Name>
<Project>{199DDE99-9EE7-4CCE-B71D-7FC1CC0896AA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\Origam.UI.Common\Origam.UI.Common.csproj">
<Name>Origam.UI.Common</Name>
<Project>{EF5DE64E-88B2-4B0A-BB7F-4A537B56F3D1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.XML">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="PrintItService.cs">
<SubType>Code</SubType>
</Compile>
<EmbeddedResource Include="Strings.resx">
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Origam.Service.Core">
<Version>2.1.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets">
</Import>
<PropertyGroup>
<PreBuildEvent />
<PostBuildEvent />
</PropertyGroup>
</Project>