Skip to content

Commit 8ac4a1f

Browse files
porreyporrey
authored
Merge pull request #1 from porrey/NET-Core-Support
Net Core support (Standard 2,1, Core 3.1, Net 5, Net 6)
2 parents 65e1c0d + 9d2b718 commit 8ac4a1f

35 files changed

Lines changed: 681 additions & 1073 deletions

‎.vs/Ghostscript.NET.VS2019/DesignTimeBuild/.dtbcache.v2‎

185 KB
Binary file not shown.

‎.vs/Ghostscript.NET.VS2022/DesignTimeBuild/.dtbcache.v2‎

313 KB
Binary file not shown.

‎.vs/Ghostscript.NET.VS2022/project-colors.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Version": 1,
3+
"ProjectMap": {
4+
"8bdbdeec-cab1-4c0b-86c2-7b0d0d3fe363": {
5+
"ProjectGuid": "8bdbdeec-cab1-4c0b-86c2-7b0d0d3fe363",
6+
"DisplayName": "Ghostscript.NET",
7+
"ColorIndex": 0
8+
},
9+
"c099eb3a-b4d7-4379-afab-4fcd4df4f003": {
10+
"ProjectGuid": "c099eb3a-b4d7-4379-afab-4fcd4df4f003",
11+
"DisplayName": "Ghostscript.NET.Viewer",
12+
"ColorIndex": 1
13+
},
14+
"3509f0f7-a7ad-4fee-b388-aa817f3413e9": {
15+
"ProjectGuid": "3509f0f7-a7ad-4fee-b388-aa817f3413e9",
16+
"DisplayName": "Ghostscript.NET.DisplayTest",
17+
"ColorIndex": 2
18+
},
19+
"a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
20+
"ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
21+
"DisplayName": "Miscellaneous Files",
22+
"ColorIndex": -1
23+
},
24+
"4c7b5a1e-2172-48a8-8139-5cb7a3d6065f": {
25+
"ProjectGuid": "4c7b5a1e-2172-48a8-8139-5cb7a3d6065f",
26+
"DisplayName": "Ghostscript.NET.Samples",
27+
"ColorIndex": 3
28+
},
29+
"3aa07e8a-8e52-4e60-a6bb-a5991b5f829f": {
30+
"ProjectGuid": "3aa07e8a-8e52-4e60-a6bb-a5991b5f829f",
31+
"DisplayName": "root",
32+
"ColorIndex": 4
33+
}
34+
},
35+
"NextColorIndex": 5
36+
}

‎.vs/Ghostscript.NET.VS2022/v17/.futdcache.v1‎

3.43 KB
Binary file not shown.

‎.vs/ProjectSettings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"CurrentProjectSetting": null
3+
}

‎.vs/VSWorkspaceState.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"ExpandedNodes": [
3+
""
4+
],
5+
"SelectedNode": "\\Ghostscript.NET.VS2019.sln",
6+
"PreviewInSolutionExplorer": false
7+
}

‎.vs/slnx.sqlite‎

1.35 MB
Binary file not shown.

‎Ghostscript.NET.DisplayTest/Ghostscript.NET.DisplayTest.csproj‎

Lines changed: 23 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{3509F0F7-A7AD-4FEE-B388-AA817F3413E9}</ProjectGuid>
9-
<OutputType>WinExe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Ghostscript.NET.DisplayTest</RootNamespace>
12-
<AssemblyName>Ghostscript.NET.DisplayTest</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>
15-
</TargetFrameworkProfile>
16-
<FileAlignment>512</FileAlignment>
17-
<SccProjectName>
18-
</SccProjectName>
19-
<SccLocalPath>
20-
</SccLocalPath>
21-
<SccAuxPath>
22-
</SccAuxPath>
23-
<SccProvider>
24-
</SccProvider>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugSymbols>true</DebugSymbols>
29-
<DebugType>full</DebugType>
30-
<Optimize>false</Optimize>
31-
<OutputPath>bin\Debug\</OutputPath>
32-
<DefineConstants>DEBUG;TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
37-
<PlatformTarget>AnyCPU</PlatformTarget>
38-
<DebugType>pdbonly</DebugType>
39-
<Optimize>true</Optimize>
40-
<OutputPath>bin\Release\</OutputPath>
41-
<DefineConstants>TRACE</DefineConstants>
42-
<ErrorReport>prompt</ErrorReport>
43-
<WarningLevel>4</WarningLevel>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
46-
<DebugSymbols>true</DebugSymbols>
47-
<OutputPath>bin\x64\Debug\</OutputPath>
48-
<DefineConstants>DEBUG;TRACE</DefineConstants>
49-
<DebugType>full</DebugType>
50-
<PlatformTarget>AnyCPU</PlatformTarget>
51-
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
53-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
54-
</PropertyGroup>
55-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
56-
<OutputPath>bin\x64\Release\</OutputPath>
57-
<DefineConstants>TRACE</DefineConstants>
58-
<Optimize>true</Optimize>
59-
<DebugType>pdbonly</DebugType>
60-
<PlatformTarget>AnyCPU</PlatformTarget>
61-
<ErrorReport>prompt</ErrorReport>
62-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
63-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
64-
</PropertyGroup>
65-
<ItemGroup>
66-
<Reference Include="System" />
67-
<Reference Include="System.Core" />
68-
<Reference Include="System.Data" />
69-
<Reference Include="System.Drawing" />
70-
<Reference Include="System.Windows.Forms" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<Compile Include="Callbacks\StdIOHandler.cs" />
74-
<Compile Include="FMain.cs">
75-
<SubType>Form</SubType>
76-
</Compile>
77-
<Compile Include="FMain.Designer.cs">
78-
<DependentUpon>FMain.cs</DependentUpon>
79-
</Compile>
80-
<Compile Include="FPreview.cs">
81-
<SubType>Form</SubType>
82-
</Compile>
83-
<Compile Include="FPreview.Designer.cs">
84-
<DependentUpon>FPreview.cs</DependentUpon>
85-
</Compile>
86-
<Compile Include="Program.cs" />
87-
<Compile Include="Properties\AssemblyInfo.cs" />
88-
<EmbeddedResource Include="FMain.resx">
89-
<DependentUpon>FMain.cs</DependentUpon>
90-
</EmbeddedResource>
91-
<EmbeddedResource Include="FPreview.resx">
92-
<DependentUpon>FPreview.cs</DependentUpon>
93-
</EmbeddedResource>
94-
<EmbeddedResource Include="Properties\Resources.resx">
95-
<Generator>ResXFileCodeGenerator</Generator>
96-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
97-
<SubType>Designer</SubType>
98-
</EmbeddedResource>
99-
<Compile Include="Properties\Resources.Designer.cs">
100-
<AutoGen>True</AutoGen>
101-
<DependentUpon>Resources.resx</DependentUpon>
102-
<DesignTime>True</DesignTime>
103-
</Compile>
104-
<None Include="app.config" />
105-
<None Include="Properties\Settings.settings">
106-
<Generator>SettingsSingleFileGenerator</Generator>
107-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
108-
</None>
109-
<Compile Include="Properties\Settings.Designer.cs">
110-
<AutoGen>True</AutoGen>
111-
<DependentUpon>Settings.settings</DependentUpon>
112-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
113-
</Compile>
114-
</ItemGroup>
115-
<ItemGroup>
116-
<ProjectReference Include="..\Ghostscript.NET\Ghostscript.NET.csproj">
117-
<Project>{8BDBDEEC-CAB1-4C0B-86C2-7B0D0D3FE363}</Project>
118-
<Name>Ghostscript.NET</Name>
119-
</ProjectReference>
120-
</ItemGroup>
121-
<ItemGroup />
122-
<ItemGroup>
123-
<Content Include="_res\ghostscript-dotnet.png" />
124-
</ItemGroup>
125-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
126-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127-
Other similar extension points exist, see Microsoft.Common.targets.
128-
<Target Name="BeforeBuild">
129-
</Target>
130-
<Target Name="AfterBuild">
131-
</Target>
132-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net6.0-windows</TargetFramework>
4+
<Nullable>disable</Nullable>
5+
<OutputType>WinExe</OutputType>
6+
<Copyright>Copyright © 2013-2021 Josip Habjan (habjan@gmail.com)</Copyright>
7+
<PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
8+
<UseWindowsForms>True</UseWindowsForms>
9+
<Version>1.4.0</Version>
10+
<FileVersion>1.4.0</FileVersion>
11+
<AssemblyVersion>1.4.0</AssemblyVersion>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<None Remove="_res\ghostscript-dotnet.png" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<Content Include="_res\ghostscript-dotnet.png">
18+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
19+
</Content>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ProjectReference Include="..\Ghostscript.NET\Ghostscript.NET.csproj" />
23+
</ItemGroup>
13324
</Project>

‎Ghostscript.NET.DisplayTest/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Ghostscript.NET.Samples/Ghostscript.NET.Samples.csproj‎

Lines changed: 14 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{4C7B5A1E-2172-48A8-8139-5CB7A3D6065F}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Ghostscript.NET.Samples</RootNamespace>
12-
<AssemblyName>Ghostscript.NET.Samples</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>
15-
</TargetFrameworkProfile>
16-
<FileAlignment>512</FileAlignment>
17-
<SccProjectName>
18-
</SccProjectName>
19-
<SccLocalPath>
20-
</SccLocalPath>
21-
<SccAuxPath>
22-
</SccAuxPath>
23-
<SccProvider>
24-
</SccProvider>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
27-
<PlatformTarget>x64</PlatformTarget>
28-
<DebugSymbols>true</DebugSymbols>
29-
<DebugType>full</DebugType>
30-
<Optimize>false</Optimize>
31-
<OutputPath>bin\Debug\</OutputPath>
32-
<DefineConstants>DEBUG;TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
37-
<PlatformTarget>AnyCPU</PlatformTarget>
38-
<DebugType>pdbonly</DebugType>
39-
<Optimize>true</Optimize>
40-
<OutputPath>bin\Release\</OutputPath>
41-
<DefineConstants>TRACE</DefineConstants>
42-
<ErrorReport>prompt</ErrorReport>
43-
<WarningLevel>4</WarningLevel>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
46-
<DebugSymbols>true</DebugSymbols>
47-
<OutputPath>bin\x64\Debug\</OutputPath>
48-
<DefineConstants>DEBUG;TRACE</DefineConstants>
49-
<DebugType>full</DebugType>
50-
<PlatformTarget>AnyCPU</PlatformTarget>
51-
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
53-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
54-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
57-
<OutputPath>bin\x64\Release\</OutputPath>
58-
<DefineConstants>TRACE</DefineConstants>
59-
<Optimize>true</Optimize>
60-
<DebugType>pdbonly</DebugType>
61-
<PlatformTarget>AnyCPU</PlatformTarget>
62-
<ErrorReport>prompt</ErrorReport>
63-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
64-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
65-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
66-
</PropertyGroup>
67-
<ItemGroup>
68-
<Reference Include="System" />
69-
<Reference Include="System.Core" />
70-
<Reference Include="System.Drawing" />
71-
<Reference Include="System.Data" />
72-
</ItemGroup>
73-
<ItemGroup>
74-
<Compile Include="Samples\AddWatermarkSample.cs" />
75-
<Compile Include="Samples\CustomGsdllLocationSample.cs" />
76-
<Compile Include="Samples\GetInkCoverageSample.cs" />
77-
<Compile Include="Samples\DeviceUsageSample.cs" />
78-
<Compile Include="Samples\PipedOutputSample.cs" />
79-
<Compile Include="Samples\ProcessorSample1.cs" />
80-
<Compile Include="Samples\RasterizerCropSample.cs" />
81-
<Compile Include="Samples\RasterizerSample1.cs" />
82-
<Compile Include="Samples\RasterizerSample2.cs" />
83-
<Compile Include="Samples\SendToPrinterSample.cs" />
84-
<Compile Include="Samples\ProcessorSample2.cs" />
85-
<Compile Include="Samples\ViewerSample.cs" />
86-
<Compile Include="Samples\FindInstalledGhostscriptVersionsSample.cs" />
87-
<Compile Include="Samples\RunMultipleInstancesSample.cs" />
88-
<Compile Include="StdIOHandlers\ConsoleStdIO.cs" />
89-
<Compile Include="ISample.cs" />
90-
<Compile Include="Program.cs" />
91-
<Compile Include="Properties\AssemblyInfo.cs" />
92-
<Compile Include="StdIOHandlers\DelegateStdIOHandler.cs" />
93-
</ItemGroup>
94-
<ItemGroup>
95-
<ProjectReference Include="..\Ghostscript.NET\Ghostscript.NET.csproj">
96-
<Project>{8BDBDEEC-CAB1-4C0B-86C2-7B0D0D3FE363}</Project>
97-
<Name>Ghostscript.NET</Name>
98-
</ProjectReference>
99-
</ItemGroup>
100-
<ItemGroup>
101-
<None Include="app.config" />
102-
</ItemGroup>
103-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105-
Other similar extension points exist, see Microsoft.Common.targets.
106-
<Target Name="BeforeBuild">
107-
</Target>
108-
<Target Name="AfterBuild">
109-
</Target>
110-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net6.0-windows</TargetFramework>
4+
<Nullable>disable</Nullable>
5+
<OutputType>Exe</OutputType>
6+
<Copyright>Copyright © 2013-2021 Josip Habjan (habjan@gmail.com)</Copyright>
7+
<PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
8+
<Version>1.4.0</Version>
9+
<FileVersion>1.4.0</FileVersion>
10+
<AssemblyVersion>1.4.0</AssemblyVersion>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\Ghostscript.NET\Ghostscript.NET.csproj" />
14+
</ItemGroup>
11115
</Project>

0 commit comments

Comments
 (0)