Skip to content

Commit eb3767f

Browse files
author
s2quake
committed
1.1.18134.1310
netstandard2.0;net45;net35 지원 가능하도록 변경
1 parent 7504748 commit eb3767f

File tree

6 files changed

+42
-212
lines changed

6 files changed

+42
-212
lines changed

‎Ntreev.Library.Psd.AssemblyInfo/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[assembly: AssemblyCopyright("Copyright © Ntreev Soft 2015")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyCulture("")]
11-
[assembly: AssemblyVersion("1.1.0.0")]
12-
[assembly: AssemblyFileVersion("1.1.18124.1812")]
13-
[assembly: AssemblyInformationalVersion("1.1.18124.1812")]
11+
[assembly: AssemblyVersion("1.1.18134.1310")]
12+
[assembly: AssemblyFileVersion("")]
13+
[assembly: AssemblyInformationalVersion("")]

‎Ntreev.Library.Psd/Ntreev.Library.Psd.csproj

Lines changed: 29 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<ProjectType>local</ProjectType>
5-
<ProjectVersion>7.10.3077</ProjectVersion>
6-
<SchemaVersion>2.0</SchemaVersion>
7-
<ProjectGuid>{2A3BAD6E-CEB1-432B-87E2-0581E36067E7}</ProjectGuid>
8-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
9-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
10-
<AssemblyName>Ntreev.Library.Psd</AssemblyName>
11-
<DefaultClientScript>JScript</DefaultClientScript>
12-
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
13-
<DefaultTargetSchema>IE50</DefaultTargetSchema>
14-
<DelaySign>false</DelaySign>
15-
<OutputType>Library</OutputType>
16-
<FileUpgradeFlags>
17-
</FileUpgradeFlags>
18-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
19-
<UpgradeBackupLocation>
20-
</UpgradeBackupLocation>
21-
<OldToolsVersion>0.0</OldToolsVersion>
22-
<TargetFrameworkProfile>
23-
</TargetFrameworkProfile>
4+
<TargetFrameworks>netstandard2.0;net45;net35</TargetFrameworks>
5+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<Version>1.1.18134.1310</Version>
7+
<AssemblyVersion>1.1.0.0</AssemblyVersion>
8+
<FileVersion>1.1.18134.1310</FileVersion>
9+
<RepositoryType>git</RepositoryType>
10+
<PackageLicenseUrl>https://github.com/NtreevSoft/psd-parser/blob/master/LICENSE.md</PackageLicenseUrl>
11+
<Copyright>Copyright ¨Ï Ntreev Soft 2018</Copyright>
12+
<Description>Photoshop file parser for .net</Description>
13+
<Company>NtreevSoft</Company>
14+
<Authors>s2quake</Authors>
15+
<RepositoryUrl>https://github.com/NtreevSoft/psd-parser</RepositoryUrl>
16+
<PackageTags>c# parser photoshop .net</PackageTags>
2417
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
26-
<OutputPath>..\bin\Debug\lib\</OutputPath>
27-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
28-
<DefineConstants>DEBUG;TRACE</DefineConstants>
29-
<DebugSymbols>true</DebugSymbols>
30-
<NoStdLib>false</NoStdLib>
31-
<Optimize>false</Optimize>
32-
<WarningLevel>4</WarningLevel>
33-
<DebugType>full</DebugType>
34-
<ErrorReport>prompt</ErrorReport>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</PropertyGroup>
37-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
38-
<OutputPath>..\bin\Release\lib\</OutputPath>
39-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
40-
<DefineConstants>TRACE</DefineConstants>
41-
<DebugSymbols>false</DebugSymbols>
42-
<NoStdLib>false</NoStdLib>
43-
<Optimize>true</Optimize>
44-
<WarningLevel>4</WarningLevel>
45-
<DebugType>none</DebugType>
46-
<ErrorReport>prompt</ErrorReport>
47-
<Prefer32Bit>false</Prefer32Bit>
48-
</PropertyGroup>
49-
<PropertyGroup>
50-
<RootNamespace>Ntreev.Library.Psd</RootNamespace>
51-
</PropertyGroup>
52-
<ItemGroup>
53-
<Compile Include="AdditionalLayerInformation.cs" />
54-
<Compile Include="ChannelType.cs" />
55-
<Compile Include="ColorMode.cs" />
56-
<Compile Include="ColorSpace.cs" />
57-
<Compile Include="CompressionType.cs" />
58-
<Compile Include="LayerAndMaskInformationSection.cs" />
59-
<Compile Include="LayerBlendingRanges.cs" />
60-
<Compile Include="LayerMask.cs" />
61-
<Compile Include="LayerExtraRecords.cs" />
62-
<Compile Include="LayerRecords.cs" />
63-
<Compile Include="Readers\EmptyResourceReader.cs" />
64-
<Compile Include="Readers\LayerAndMaskInformation\LinkedDocumnetFileHeaderReader.cs" />
65-
<Compile Include="Readers\LayerAndMaskInformation\LinkedDocumentReader.cs" />
66-
<Compile Include="Readers\LayerAndMaskInformation\EmbeddedLayerReader.cs" />
67-
<Compile Include="Readers\LayerAndMaskInformation\LinkedLayerReader.cs" />
68-
<Compile Include="Readers\LayerResources\Reader_lnk2.cs" />
69-
<Compile Include="Readers\LayerResources\Reader_lnk3.cs" />
70-
<Compile Include="Readers\LayerResources\Reader_lnkD.cs" />
71-
<Compile Include="Readers\LayerResources\Reader_lnkE.cs" />
72-
<Compile Include="Readers\LayerResources\Reader_lsdk.cs" />
73-
<Compile Include="Readers\LayerResources\Reader_lyvr.cs" />
74-
<Compile Include="Readers\ResourceReaderBase.cs" />
75-
<Compile Include="ValueReader.cs" />
76-
<Compile Include="Readers\LayerAndMaskInformation\ChannelsReader.cs" />
77-
<Compile Include="Readers\ImageResources\Reader_GridAndGuides.cs" />
78-
<Compile Include="IChannel.cs" />
79-
<Compile Include="ILinkedLayer.cs" />
80-
<Compile Include="Readers\ImageDataSectionReader.cs" />
81-
<Compile Include="Readers\ImageResourcesSectionReader.cs" />
82-
<Compile Include="InternalDocument.cs" />
83-
<Compile Include="InvalidFormatException.cs" />
84-
<Compile Include="IPsdLayer.cs" />
85-
<Compile Include="EmbeddedLayer.cs" />
86-
<Compile Include="Readers\LayerAndMaskInformation\LayerExtraRecordsReader.cs" />
87-
<Compile Include="Readers\LayerAndMaskInformation\LayerRecordsReader.cs" />
88-
<Compile Include="Readers\LayerAndMaskInformation\LayerResourceReader.cs" />
89-
<Compile Include="Readers\LayerAndMaskInformation\DocumentResourceReader.cs" />
90-
<Compile Include="Readers\LayerAndMaskInformation\LayerInfoReader.cs" />
91-
<Compile Include="PathResolver.cs" />
92-
<Compile Include="LazyValueReader.cs" />
93-
<Compile Include="LazyProperties.cs" />
94-
<Compile Include="PsdResolver.cs" />
95-
<Compile Include="RangeStream.cs" />
96-
<Compile Include="Readers\ColorModeDataSectionReader.cs" />
97-
<Compile Include="Readers\FileHeaderSectionReader.cs" />
98-
<Compile Include="Readers\ReaderCollector.cs" />
99-
<Compile Include="ResourceIDAttribute.cs" />
100-
<Compile Include="Readers\LayerResources\Reader_shmd.cs" />
101-
<Compile Include="Readers\LayerResources\Reader_iOpa.cs" />
102-
<Compile Include="Readers\LayerResources\Reader_lsct.cs" />
103-
<Compile Include="Readers\LayerResources\Reader_lyid.cs" />
104-
<Compile Include="Readers\LayerResources\Reader_luni.cs" />
105-
<Compile Include="Readers\LayerResources\Reader_TySh.cs" />
106-
<Compile Include="Readers\LayerResources\Reader_fxrp.cs" />
107-
<Compile Include="Readers\LayerResources\Reader_lnsr.cs" />
108-
<Compile Include="Readers\LayerResources\Reader_PlLd.cs" />
109-
<Compile Include="Readers\LayerResources\Reader_SoLd.cs" />
110-
<Compile Include="Readers\LayerResources\Reader_lfx2.cs" />
111-
<Compile Include="Readers\LayerResources\Reader_SoLE.cs" />
112-
<Compile Include="Readers\LayerResources\Reader_lrFX.cs" />
113-
<Compile Include="Readers\ImageResources\Reader_VersionInfo.cs" />
114-
<Compile Include="Readers\ImageResources\Reader_ResolutionInfo.cs" />
115-
<Compile Include="Readers\ImageResources\Reader_SlicesInfo.cs" />
116-
<Compile Include="Structures\BaseStructure.cs" />
117-
<Compile Include="Structures\StructureReader.cs" />
118-
<Compile Include="Structures\StructureAlias.cs" />
119-
<Compile Include="Structures\StructureClass.cs" />
120-
<Compile Include="Structures\StructureEngineData.cs" />
121-
<Compile Include="Structures\StructureEnumerate.cs" />
122-
<Compile Include="Structures\StructureEnumerateReference.cs" />
123-
<Compile Include="Structures\StructureList.cs" />
124-
<Compile Include="Structures\StructureObjectArray.cs" />
125-
<Compile Include="Structures\StructureOffset.cs" />
126-
<Compile Include="Structures\StructureProperty.cs" />
127-
<Compile Include="Structures\StructureReference.cs" />
128-
<Compile Include="Structures\StructureUnitFloat.cs" />
129-
<Compile Include="Structures\StructureUnknownOSType.cs" />
130-
<Compile Include="Extensions.cs" />
131-
<Compile Include="Readers\LayerAndMaskInformation\GlobalLayerMaskInfoReader.cs" />
132-
<Compile Include="IImageSource.cs" />
133-
<Compile Include="IProperties.cs" />
134-
<Compile Include="IPropertiesExtension.cs" />
135-
<Compile Include="Readers\LayerAndMaskInformation\LayerBlendingRangesReader.cs" />
136-
<Compile Include="LayerFlags.cs" />
137-
<Compile Include="Readers\LayerAndMaskInformation\LayerMaskReader.cs" />
138-
<Compile Include="LinkedLayer.cs" />
139-
<Compile Include="SectionType.cs" />
140-
<Compile Include="Properties.cs" />
141-
<Compile Include="Properties\AssemblyInfo.cs">
142-
<SubType>Code</SubType>
143-
</Compile>
144-
<Compile Include="DescriptorStructure.cs" />
145-
<Compile Include="PsdReader.cs">
146-
<SubType>Code</SubType>
147-
</Compile>
148-
<Compile Include="PsdDocument.cs">
149-
<SubType>Code</SubType>
150-
</Compile>
151-
<Compile Include="BlendMode.cs" />
152-
<Compile Include="Channel.cs">
153-
<SubType>Code</SubType>
154-
</Compile>
155-
<Compile Include="FileHeaderSection.cs">
156-
<SubType>Code</SubType>
157-
</Compile>
158-
<Compile Include="PsdLayer.cs">
159-
<SubType>Code</SubType>
160-
</Compile>
161-
<Compile Include="Readers\LayerAndMaskInformationSectionReader.cs">
162-
<SubType>Code</SubType>
163-
</Compile>
164-
<Compile Include="PsdUtility.cs">
165-
<SubType>Code</SubType>
166-
</Compile>
167-
<Compile Include="UnitType.cs" />
18+
19+
<ItemGroup Condition="'$(TargetFramework)'=='net35'">
20+
<Reference Include="System" />
21+
<Reference Include="System.Core" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
25+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
16826
</ItemGroup>
169-
<ItemGroup>
27+
28+
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
29+
<Reference Include="Microsoft.CSharp" />
17030
<Reference Include="System" />
31+
<Reference Include="System.Core" />
17132
</ItemGroup>
172-
<Import Project="..\Ntreev.Library.Psd.AssemblyInfo\Ntreev.Library.Psd.AssemblyInfo.projitems" Label="Shared" />
173-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
174-
<PropertyGroup>
175-
<PreBuildEvent />
176-
<PostBuildEvent />
177-
</PropertyGroup>
178-
</Project>
33+
34+
</Project>

‎Ntreev.Library.Psd/Properties/AssemblyInfo.cs

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

‎gen-ver.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
powershell -executionpolicy remotesigned -File gen-ver.ps1

‎gen-ver.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
$majorVersion=1
2+
$minorVersion=1
3+
$version="$majorVersion.$minorVersion"+"."+(Get-Date -Format yy)+(Get-Date).DayOfYear+"."+(Get-Date -Format HHmm)
4+
$csproj="Ntreev.Library.Psd\Ntreev.Library.Psd.csproj"
5+
$assemblyInfo = "Ntreev.Library.Psd.AssemblyInfo\AssemblyInfo.cs"
6+
Set-Content version.txt $version
7+
(Get-Content $csproj) -replace "(<Version>)(.*)(</Version>)", "`${1}$version`$3" -replace "(<FileVersion>)(.*)(</FileVersion>)", "`${1}$version`$3" -replace "(<AssemblyVersion>)(.*)(</AssemblyVersion>)", "`${1}$majorVersion.$minorVersion.0.0`$3" | Set-Content $csproj
8+
(Get-Content $assemblyInfo) -replace "(AssemblyVersion[(]`").+(`"[)]])", "`${1}$version`$2" -replace "(AssemblyFileVersion[(]`").+(`"[)]])", "`${1}$fileVersion`$2" -replace "(AssemblyInformationalVersion[(]`").+(`"[)]])", "`${1}$fileVersion`$2" | Set-Content $assemblyInfo

‎version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.18124.1812
1+
1.1.18134.1310

0 commit comments

Comments
 (0)