Skip to content

Commit d62c3da

Browse files
poumasonpoumason
authored
Merge pull request #5 from KKBOX/master_pou
Support .NET Standard
2 parents 2c2b796 + 97d4408 commit d62c3da

File tree

75 files changed

+73
-500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+73
-500
lines changed

‎MakeDoc/generate_markdown.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cd ..
22
cd ..
33
cd MakeDoc
4-
MarkdownGenerator.exe KKBOX.OpenAPI.Universal.dll
4+
MarkdownGenerator.exe KKBOX.OpenAPI.Standard.dll
55
IF EXIST ".\md\Home.md" copy ".\md\Home.md" "..\Doc"
66
IF EXIST ".\md\KKBOX.OpenAPI.md" copy ".\md\KKBOX.OpenAPI.md" "..\Doc"
77
IF EXIST ".\md\KKBOX.OpenAPI.ServiceModel.md" copy ".\md\KKBOX.OpenAPI.ServiceModel.md" "..\Doc"

‎OpenAPI-Dotnet.sln‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.0
4+
VisualStudioVersion = 15.0.27130.2026
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{61980940-883D-46BF-82CF-0227FC50BD0E}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{BA88A04F-C1F9-4840-9807-448AD126237A}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAPI.Net45", "SDK\OpenAPI.Net45\OpenAPI.Net45.csproj", "{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}"
11-
EndProject
12-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OpenAPI.Shared", "SDK\OpenAPI.Shared\OpenAPI.Shared.shproj", "{C93CCB08-AFD0-4DBB-BB1D-2D64EC0C6493}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAPI.Universal", "SDK\OpenAPI.Universal\OpenAPI.Universal.csproj", "{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}"
15-
EndProject
1610
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OpenAPI.App.Shared", "Sample\OpenAPI.App.Shared\OpenAPI.App.Shared.shproj", "{0A6087B0-236B-42B6-823D-C0FA06C69C84}"
1711
EndProject
1812
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAPI.App.Universal", "Sample\OpenAPI.App.Universal\OpenAPI.App.Universal.csproj", "{72026CA8-ADB8-4AD4-A2E4-B41DC9B1FDBB}"
@@ -23,16 +17,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{3105AA83-2
2317
EndProject
2418
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAPI.Test", "Test\OpenAPI.Test\OpenAPI.Test.csproj", "{90C85819-1878-4C0D-BCDB-4BE0C29C99A0}"
2519
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAPI.Standard", "SDK\OpenAPI.Standard\OpenAPI.Standard.csproj", "{2FD09127-E2AF-43AB-865D-1320A30DE80C}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenAPI.Standard", "SDK\OpenAPI.Standard\OpenAPI.Standard.csproj", "{2FD09127-E2AF-43AB-865D-1320A30DE80C}"
2721
EndProject
2822
Global
2923
GlobalSection(SharedMSBuildProjectFiles) = preSolution
3024
Sample\OpenAPI.App.Shared\OpenAPI.App.Shared.projitems*{0a6087b0-236b-42b6-823d-c0fa06c69c84}*SharedItemsImports = 13
3125
Sample\OpenAPI.App.Shared\OpenAPI.App.Shared.projitems*{72026ca8-adb8-4ad4-a2e4-b41dc9b1fdbb}*SharedItemsImports = 4
32-
SDK\OpenAPI.Shared\OpenAPI.Shared.projitems*{751afa91-f595-42bc-a1df-d4fae84c68d4}*SharedItemsImports = 4
33-
SDK\OpenAPI.Shared\OpenAPI.Shared.projitems*{9e50e6d1-2ad3-4aef-9d6e-f40090c3b331}*SharedItemsImports = 4
3426
Sample\OpenAPI.App.Shared\OpenAPI.App.Shared.projitems*{c0ab0e5d-8124-4728-ac11-03d142e102bb}*SharedItemsImports = 4
35-
SDK\OpenAPI.Shared\OpenAPI.Shared.projitems*{c93ccb08-afd0-4dbb-bb1d-2d64ec0c6493}*SharedItemsImports = 13
3627
EndGlobalSection
3728
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3829
Debug|Any CPU = Debug|Any CPU
@@ -45,37 +36,6 @@ Global
4536
Release|x86 = Release|x86
4637
EndGlobalSection
4738
GlobalSection(ProjectConfigurationPlatforms) = postSolution
48-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|ARM.ActiveCfg = Debug|Any CPU
51-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|ARM.Build.0 = Debug|Any CPU
52-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|x64.ActiveCfg = Debug|Any CPU
53-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|x64.Build.0 = Debug|Any CPU
54-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|x86.ActiveCfg = Debug|Any CPU
55-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Debug|x86.Build.0 = Debug|Any CPU
56-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|ARM.ActiveCfg = Release|Any CPU
59-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|ARM.Build.0 = Release|Any CPU
60-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|x64.ActiveCfg = Release|Any CPU
61-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|x64.Build.0 = Release|Any CPU
62-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|x86.ActiveCfg = Release|Any CPU
63-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331}.Release|x86.Build.0 = Release|Any CPU
64-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|Any CPU.ActiveCfg = Debug|x86
65-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|ARM.ActiveCfg = Debug|ARM
66-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|ARM.Build.0 = Debug|ARM
67-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|x64.ActiveCfg = Debug|x64
68-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|x64.Build.0 = Debug|x64
69-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|x86.ActiveCfg = Debug|x86
70-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Debug|x86.Build.0 = Debug|x86
71-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|ARM.ActiveCfg = Release|ARM
74-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|ARM.Build.0 = Release|ARM
75-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|x64.ActiveCfg = Release|x64
76-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|x64.Build.0 = Release|x64
77-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|x86.ActiveCfg = Release|x86
78-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4}.Release|x86.Build.0 = Release|x86
7939
{72026CA8-ADB8-4AD4-A2E4-B41DC9B1FDBB}.Debug|Any CPU.ActiveCfg = Debug|x86
8040
{72026CA8-ADB8-4AD4-A2E4-B41DC9B1FDBB}.Debug|ARM.ActiveCfg = Debug|ARM
8141
{72026CA8-ADB8-4AD4-A2E4-B41DC9B1FDBB}.Debug|ARM.Build.0 = Debug|ARM
@@ -149,9 +109,6 @@ Global
149109
HideSolutionNode = FALSE
150110
EndGlobalSection
151111
GlobalSection(NestedProjects) = preSolution
152-
{9E50E6D1-2AD3-4AEF-9D6E-F40090C3B331} = {61980940-883D-46BF-82CF-0227FC50BD0E}
153-
{C93CCB08-AFD0-4DBB-BB1D-2D64EC0C6493} = {61980940-883D-46BF-82CF-0227FC50BD0E}
154-
{751AFA91-F595-42BC-A1DF-D4FAE84C68D4} = {61980940-883D-46BF-82CF-0227FC50BD0E}
155112
{0A6087B0-236B-42B6-823D-C0FA06C69C84} = {BA88A04F-C1F9-4840-9807-448AD126237A}
156113
{72026CA8-ADB8-4AD4-A2E4-B41DC9B1FDBB} = {BA88A04F-C1F9-4840-9807-448AD126237A}
157114
{C0AB0E5D-8124-4728-AC11-03D142E102BB} = {BA88A04F-C1F9-4840-9807-448AD126237A}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
1. It should be able to use with Visual Studio 2017.
77

88
### Use Nuget to install the SDK
9-
- Universal Windows Platform: [KKBOX.OpenAPI.Universal](https://www.nuget.org/packages/KKBOX.OpenAPI.Universal)
10-
- .NET Framework: [KKBOX.OpenAPI.Net45](https://www.nuget.org/packages/KKBOX.OpenAPI.Net45/)
9+
- [![NuGet](https://img.shields.io/nuget/v/Nuget.Core.svg)](https://www.nuget.org/packages/KKBOX.OpenAPI.Standard/)
10+
- .NET Standard 1.4, .NET Framework 4.5/6.1 and Universal Windows Platform.
1111

1212
### Prepare client ID & client secret
1313
Browse [KKBOX Developer Website](https://developer.kkbox.com/) and create an developer account, then create an app to get the client ID and client secret.

‎SDK/OpenAPI.Net45/OpenAPI.Net45.csproj‎

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

‎SDK/OpenAPI.Net45/OpenAPI.Net45.nuspec‎

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

‎SDK/OpenAPI.Net45/Properties/AssemblyInfo.cs‎

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

‎SDK/OpenAPI.Net45/packages.config‎

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

‎SDK/OpenAPI.Shared/OpenAPI.Shared.projitems‎

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

‎SDK/OpenAPI.Shared/OpenAPI.Shared.shproj‎

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

‎SDK/OpenAPI.Shared/KKBOXAPI.cs‎ renamed to ‎SDK/OpenAPI.Standard/KKBOXAPI.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)