Skip to content

Commit

Permalink
Merge pull request #57 from barnhill/net-core-conversion
Browse files Browse the repository at this point in the history
.NET Standard Conversion
  • Loading branch information
barnhill authored Nov 22, 2018
2 parents 7d04599 + b7ad7d7 commit 325ac29
Show file tree
Hide file tree
Showing 88 changed files with 715 additions and 3,153 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
language: csharp
mono: none
os: linux
dotnet: 2.1.4
solution: Barcode.sln

install:
- dotnet restore

script:
- xbuild Barcode.sln
- cd BarcodeStandard
- dotnet build
85 changes: 34 additions & 51 deletions Barcode.sln
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarcodeLibTest", "BarcodeLibTest\BarcodeLibTest.csproj", "{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}"
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2018
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BarcodeStandard", "BarcodeStandard\BarcodeStandard.csproj", "{24B824A4-A4F1-4C31-A935-7EA11304B48B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarcodeLib", "BarcodeLib\BarcodeLib.csproj", "{F8646414-0C9C-49BB-9DA3-3923BF78A398}"
EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "BarcodeDemo", "BarcodeDemo\", "{F66997B3-1333-4C79-A268-DA9DD62174A2}"
ProjectSection(WebsiteProperties) = preProject
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
Debug.AspNetCompiler.VirtualPath = "/BarcodeDemo"
Debug.AspNetCompiler.PhysicalPath = "BarcodeDemo\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\BarcodeDemo\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/BarcodeDemo"
Release.AspNetCompiler.PhysicalPath = "BarcodeDemo\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\BarcodeDemo\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
VWDPort = "59259"
DefaultWebSiteLanguage = "Visual C#"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarcodeStandardExample", "BarcodeStandardExample\BarcodeStandardExample.csproj", "{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}"
ProjectSection(ProjectDependencies) = postProject
{24B824A4-A4F1-4C31-A935-7EA11304B48B} = {24B824A4-A4F1-4C31-A935-7EA11304B48B}
EndProjectSection
EndProject
Global
Expand All @@ -36,36 +20,35 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Debug|.NET.ActiveCfg = Debug|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Debug|.NET.Build.0 = Debug|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Debug|x86.ActiveCfg = Debug|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Release|.NET.ActiveCfg = Release|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Release|Any CPU.Build.0 = Release|Any CPU
{8DB57BA1-E88C-43D9-AD0E-04BFA6B11C61}.Release|x86.ActiveCfg = Release|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|.NET.ActiveCfg = Debug|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|.NET.Build.0 = Debug|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|x86.ActiveCfg = Debug|x86
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Debug|x86.Build.0 = Debug|x86
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Release|.NET.ActiveCfg = Release|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Release|Any CPU.Build.0 = Release|Any CPU
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Release|x86.ActiveCfg = Release|x86
{F8646414-0C9C-49BB-9DA3-3923BF78A398}.Release|x86.Build.0 = Release|x86
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Debug|.NET.ActiveCfg = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Debug|x86.ActiveCfg = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Release|.NET.ActiveCfg = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Release|Any CPU.Build.0 = Debug|Any CPU
{F66997B3-1333-4C79-A268-DA9DD62174A2}.Release|x86.ActiveCfg = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|.NET.ActiveCfg = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|.NET.Build.0 = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|x86.ActiveCfg = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Debug|x86.Build.0 = Debug|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|.NET.ActiveCfg = Release|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|.NET.Build.0 = Release|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|Any CPU.Build.0 = Release|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|x86.ActiveCfg = Release|Any CPU
{24B824A4-A4F1-4C31-A935-7EA11304B48B}.Release|x86.Build.0 = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|.NET.ActiveCfg = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|.NET.Build.0 = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|Any CPU.Build.0 = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|x86.ActiveCfg = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Debug|x86.Build.0 = Debug|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|.NET.ActiveCfg = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|.NET.Build.0 = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|Any CPU.ActiveCfg = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|Any CPU.Build.0 = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|x86.ActiveCfg = Release|Any CPU
{411EC0AA-B1A0-4B77-AAAC-19AD20AA5678}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E8B3FD4E-DAB0-460E-B8D8-9C5881AE6963}
EndGlobalSection
EndGlobal
Binary file removed BarcodeDemo/AjaxControlToolkit.dll
Binary file not shown.
Binary file removed BarcodeDemo/BarcodeLib.dll
Binary file not shown.
187 changes: 0 additions & 187 deletions BarcodeDemo/Default.aspx

This file was deleted.

42 changes: 0 additions & 42 deletions BarcodeDemo/Default.aspx.cs

This file was deleted.

16 changes: 0 additions & 16 deletions BarcodeDemo/GenerateBarcodeImage.aspx

This file was deleted.

Loading

0 comments on commit 325ac29

Please sign in to comment.