Skip to content

Commit f361956

Browse files
NikolayITNikolayIT
committed
GenCode128 is now targeting .NET Standard 2.0
1 parent 6d6d8b3 commit f361956

File tree

7 files changed

+52
-213
lines changed

7 files changed

+52
-213
lines changed

‎Source/GenCode128.sln

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
3-
VisualStudioVersion = 14.0.24627.0
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.31515.178
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenCode128", "GenCode128\GenCode128.csproj", "{32817BF9-E380-4467-9C7F-936F4B122BC7}"
6-
EndProject
75
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenCode128Tests", "GenCode128Tests\GenCode128Tests.csproj", "{8DA9BF9D-6901-44C9-8A52-689415350740}"
86
EndProject
97
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{A0B295B3-90A1-49B7-B939-C25B8C17258D}"
108
EndProject
9+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenCode128", "GenCode128\GenCode128.csproj", "{6B6FDDC7-AFB8-49CD-BA82-9349DEA8A30D}"
10+
EndProject
1111
Global
1212
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1313
Debug|Any CPU = Debug|Any CPU
1414
Release|Any CPU = Release|Any CPU
1515
EndGlobalSection
1616
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17-
{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18-
{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
19-
{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
20-
{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.Build.0 = Release|Any CPU
2117
{8DA9BF9D-6901-44C9-8A52-689415350740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2218
{8DA9BF9D-6901-44C9-8A52-689415350740}.Debug|Any CPU.Build.0 = Debug|Any CPU
2319
{8DA9BF9D-6901-44C9-8A52-689415350740}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -26,8 +22,15 @@ Global
2622
{A0B295B3-90A1-49B7-B939-C25B8C17258D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2723
{A0B295B3-90A1-49B7-B939-C25B8C17258D}.Release|Any CPU.ActiveCfg = Release|Any CPU
2824
{A0B295B3-90A1-49B7-B939-C25B8C17258D}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{6B6FDDC7-AFB8-49CD-BA82-9349DEA8A30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{6B6FDDC7-AFB8-49CD-BA82-9349DEA8A30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{6B6FDDC7-AFB8-49CD-BA82-9349DEA8A30D}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{6B6FDDC7-AFB8-49CD-BA82-9349DEA8A30D}.Release|Any CPU.Build.0 = Release|Any CPU
2929
EndGlobalSection
3030
GlobalSection(SolutionProperties) = preSolution
3131
HideSolutionNode = FALSE
3232
EndGlobalSection
33+
GlobalSection(ExtensibilityGlobals) = postSolution
34+
SolutionGuid = {B9188665-E658-4FA1-ABD1-20F3A0750F0B}
35+
EndGlobalSection
3336
EndGlobal

‎Source/GenCode128/AssemblyInfo.cs

-51
This file was deleted.

‎Source/GenCode128/GenCode128.csproj

+7-142
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<ProjectType>Local</ProjectType>
5-
<ProductVersion>8.0.50727</ProductVersion>
6-
<SchemaVersion>2.0</SchemaVersion>
7-
<ProjectGuid>{32817BF9-E380-4467-9C7F-936F4B122BC7}</ProjectGuid>
8-
<SccProjectName>
9-
</SccProjectName>
10-
<SccLocalPath>
11-
</SccLocalPath>
12-
<SccAuxPath>
13-
</SccAuxPath>
14-
<SccProvider>
15-
</SccProvider>
16-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
17-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
18-
<ApplicationIcon>App.ico</ApplicationIcon>
19-
<AssemblyKeyContainerName>
20-
</AssemblyKeyContainerName>
21-
<AssemblyName>GenCode128</AssemblyName>
22-
<AssemblyOriginatorKeyFile>
23-
</AssemblyOriginatorKeyFile>
24-
<DefaultClientScript>JScript</DefaultClientScript>
25-
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
26-
<DefaultTargetSchema>IE50</DefaultTargetSchema>
27-
<DelaySign>false</DelaySign>
28-
<OutputType>Library</OutputType>
29-
<RootNamespace>GenCode128</RootNamespace>
30-
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
31-
<StartupObject>
32-
</StartupObject>
33-
<FileUpgradeFlags>
34-
</FileUpgradeFlags>
35-
<UpgradeBackupLocation>
36-
</UpgradeBackupLocation>
37-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
38-
<OldToolsVersion>2.0</OldToolsVersion>
39-
<PublishUrl>publish\</PublishUrl>
40-
<Install>true</Install>
41-
<InstallFrom>Disk</InstallFrom>
42-
<UpdateEnabled>false</UpdateEnabled>
43-
<UpdateMode>Foreground</UpdateMode>
44-
<UpdateInterval>7</UpdateInterval>
45-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
46-
<UpdatePeriodically>false</UpdatePeriodically>
47-
<UpdateRequired>false</UpdateRequired>
48-
<MapFileExtensions>true</MapFileExtensions>
49-
<ApplicationRevision>0</ApplicationRevision>
50-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
51-
<IsWebBootstrapper>false</IsWebBootstrapper>
52-
<UseApplicationTrust>false</UseApplicationTrust>
53-
<BootstrapperEnabled>true</BootstrapperEnabled>
4+
<TargetFramework>netstandard2.0</TargetFramework>
545
</PropertyGroup>
55-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
56-
<OutputPath>bin\Debug\</OutputPath>
57-
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
58-
<BaseAddress>285212672</BaseAddress>
59-
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
60-
<ConfigurationOverrideFile>
61-
</ConfigurationOverrideFile>
62-
<DefineConstants>DEBUG;TRACE</DefineConstants>
63-
<DocumentationFile>
64-
</DocumentationFile>
65-
<DebugSymbols>true</DebugSymbols>
66-
<FileAlignment>4096</FileAlignment>
67-
<NoStdLib>false</NoStdLib>
68-
<NoWarn>
69-
</NoWarn>
70-
<Optimize>false</Optimize>
71-
<RegisterForComInterop>false</RegisterForComInterop>
72-
<RemoveIntegerChecks>false</RemoveIntegerChecks>
73-
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
74-
<WarningLevel>4</WarningLevel>
75-
<DebugType>full</DebugType>
76-
<ErrorReport>prompt</ErrorReport>
77-
</PropertyGroup>
78-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
79-
<OutputPath>bin\Release\</OutputPath>
80-
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
81-
<BaseAddress>285212672</BaseAddress>
82-
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
83-
<ConfigurationOverrideFile>
84-
</ConfigurationOverrideFile>
85-
<DefineConstants>TRACE</DefineConstants>
86-
<DocumentationFile>
87-
</DocumentationFile>
88-
<DebugSymbols>false</DebugSymbols>
89-
<FileAlignment>4096</FileAlignment>
90-
<NoStdLib>false</NoStdLib>
91-
<NoWarn>
92-
</NoWarn>
93-
<Optimize>true</Optimize>
94-
<RegisterForComInterop>false</RegisterForComInterop>
95-
<RemoveIntegerChecks>false</RemoveIntegerChecks>
96-
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
97-
<WarningLevel>4</WarningLevel>
98-
<DebugType>none</DebugType>
99-
<ErrorReport>prompt</ErrorReport>
100-
</PropertyGroup>
101-
<ItemGroup>
102-
<Reference Include="System">
103-
<Name>System</Name>
104-
</Reference>
105-
<Reference Include="System.Data">
106-
<Name>System.Data</Name>
107-
</Reference>
108-
<Reference Include="System.Drawing">
109-
<Name>System.Drawing</Name>
110-
</Reference>
111-
<Reference Include="System.Windows.Forms">
112-
<Name>System.Windows.Forms</Name>
113-
</Reference>
114-
<Reference Include="System.Xml">
115-
<Name>System.XML</Name>
116-
</Reference>
117-
</ItemGroup>
6+
1187
<ItemGroup>
119-
<Compile Include="Code128Code.cs" />
120-
<Compile Include="CodeSet.cs" />
121-
<Content Include="App.ico" />
122-
<Compile Include="AssemblyInfo.cs">
123-
<SubType>Code</SubType>
124-
</Compile>
125-
<Compile Include="Code128Content.cs">
126-
<SubType>Code</SubType>
127-
</Compile>
128-
<Compile Include="Code128Rendering.cs">
129-
<SubType>Code</SubType>
130-
</Compile>
8+
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
1319
</ItemGroup>
132-
<ItemGroup>
133-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
134-
<Visible>False</Visible>
135-
<ProductName>.NET Framework 3.5 SP1</ProductName>
136-
<Install>true</Install>
137-
</BootstrapperPackage>
138-
</ItemGroup>
139-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
140-
<PropertyGroup>
141-
<PreBuildEvent>
142-
</PreBuildEvent>
143-
<PostBuildEvent>
144-
</PostBuildEvent>
145-
</PropertyGroup>
146-
</Project>
10+
11+
</Project>

‎Source/GenCode128Tests/GenCode128Tests.csproj

+10-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</FileUpgradeFlags>
3636
<UpgradeBackupLocation>
3737
</UpgradeBackupLocation>
38-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
38+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
3939
<OldToolsVersion>2.0</OldToolsVersion>
4040
<PublishUrl>publish\</PublishUrl>
4141
<Install>true</Install>
@@ -52,6 +52,7 @@
5252
<IsWebBootstrapper>false</IsWebBootstrapper>
5353
<UseApplicationTrust>false</UseApplicationTrust>
5454
<BootstrapperEnabled>true</BootstrapperEnabled>
55+
<TargetFrameworkProfile />
5556
</PropertyGroup>
5657
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
5758
<OutputPath>bin\Debug\</OutputPath>
@@ -75,6 +76,7 @@
7576
<WarningLevel>4</WarningLevel>
7677
<DebugType>full</DebugType>
7778
<ErrorReport>prompt</ErrorReport>
79+
<Prefer32Bit>false</Prefer32Bit>
7880
</PropertyGroup>
7981
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
8082
<OutputPath>bin\Release\</OutputPath>
@@ -98,6 +100,7 @@
98100
<WarningLevel>4</WarningLevel>
99101
<DebugType>none</DebugType>
100102
<ErrorReport>prompt</ErrorReport>
103+
<Prefer32Bit>false</Prefer32Bit>
101104
</PropertyGroup>
102105
<ItemGroup>
103106
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -113,11 +116,6 @@
113116
<Reference Include="System.Xml">
114117
<Name>System.XML</Name>
115118
</Reference>
116-
<ProjectReference Include="..\GenCode128\GenCode128.csproj">
117-
<Name>GenCode128</Name>
118-
<Project>{32817BF9-E380-4467-9C7F-936F4B122BC7}</Project>
119-
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
120-
</ProjectReference>
121119
</ItemGroup>
122120
<ItemGroup>
123121
<Compile Include="AssemblyInfo.cs">
@@ -137,6 +135,12 @@
137135
<Install>true</Install>
138136
</BootstrapperPackage>
139137
</ItemGroup>
138+
<ItemGroup>
139+
<ProjectReference Include="..\GenCode128\GenCode128.csproj">
140+
<Project>{6b6fddc7-afb8-49cd-ba82-9349dea8a30d}</Project>
141+
<Name>GenCode128</Name>
142+
</ProjectReference>
143+
</ItemGroup>
140144
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
141145
<PropertyGroup>
142146
<PreBuildEvent>

‎Source/Sample/Sample.csproj

+17-6
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
</FileUpgradeFlags>
3434
<UpgradeBackupLocation>
3535
</UpgradeBackupLocation>
36-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
36+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
3737
<OldToolsVersion>2.0</OldToolsVersion>
38+
<TargetFrameworkProfile />
3839
</PropertyGroup>
3940
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4041
<OutputPath>bin\Debug\</OutputPath>
@@ -58,6 +59,7 @@
5859
<WarningLevel>4</WarningLevel>
5960
<DebugType>full</DebugType>
6061
<ErrorReport>prompt</ErrorReport>
62+
<Prefer32Bit>false</Prefer32Bit>
6163
</PropertyGroup>
6264
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
6365
<OutputPath>bin\Release\</OutputPath>
@@ -81,6 +83,7 @@
8183
<WarningLevel>4</WarningLevel>
8284
<DebugType>none</DebugType>
8385
<ErrorReport>prompt</ErrorReport>
86+
<Prefer32Bit>false</Prefer32Bit>
8487
</PropertyGroup>
8588
<ItemGroup>
8689
<Reference Include="System">
@@ -92,17 +95,15 @@
9295
<Reference Include="System.Drawing">
9396
<Name>System.Drawing</Name>
9497
</Reference>
98+
<Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
99+
<HintPath>..\packages\System.Drawing.Common.5.0.2\lib\net461\System.Drawing.Common.dll</HintPath>
100+
</Reference>
95101
<Reference Include="System.Windows.Forms">
96102
<Name>System.Windows.Forms</Name>
97103
</Reference>
98104
<Reference Include="System.Xml">
99105
<Name>System.XML</Name>
100106
</Reference>
101-
<ProjectReference Include="..\GenCode128\GenCode128.csproj">
102-
<Name>GenCode128</Name>
103-
<Project>{32817BF9-E380-4467-9C7F-936F4B122BC7}</Project>
104-
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105-
</ProjectReference>
106107
</ItemGroup>
107108
<ItemGroup>
108109
<Content Include="App.ico" />
@@ -116,6 +117,16 @@
116117
<DependentUpon>Form1.cs</DependentUpon>
117118
</EmbeddedResource>
118119
</ItemGroup>
120+
<ItemGroup>
121+
<None Include="app.config" />
122+
<None Include="packages.config" />
123+
</ItemGroup>
124+
<ItemGroup>
125+
<ProjectReference Include="..\GenCode128\GenCode128.csproj">
126+
<Project>{6b6fddc7-afb8-49cd-ba82-9349dea8a30d}</Project>
127+
<Name>GenCode128</Name>
128+
</ProjectReference>
129+
</ItemGroup>
119130
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
120131
<PropertyGroup>
121132
<PreBuildEvent>

‎Source/Sample/app.config

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎Source/Sample/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="System.Drawing.Common" version="5.0.2" targetFramework="net461" />
4+
</packages>

0 commit comments

Comments
 (0)