From bba425054f6f44f42d7d15c44cf83e7fff4172ab Mon Sep 17 00:00:00 2001 From: John Date: Fri, 26 Apr 2019 12:29:29 +0800 Subject: [PATCH 1/3] upgrade .net to dotnet core --- sample/App.config | 2 +- sample/aliyun-tablestore-sdk-sample.csproj | 7 +- sample/packages.config | 2 +- sdk/Properties/AssemblyInfo.cs | 36 ---- sdk/aliyun-tablestore-sdk.csproj | 228 +-------------------- 5 files changed, 13 insertions(+), 262 deletions(-) delete mode 100644 sdk/Properties/AssemblyInfo.cs diff --git a/sample/App.config b/sample/App.config index 74ade9d..2d2a12d 100644 --- a/sample/App.config +++ b/sample/App.config @@ -1,6 +1,6 @@ - + diff --git a/sample/aliyun-tablestore-sdk-sample.csproj b/sample/aliyun-tablestore-sdk-sample.csproj index 34bfe00..22072cd 100644 --- a/sample/aliyun-tablestore-sdk-sample.csproj +++ b/sample/aliyun-tablestore-sdk-sample.csproj @@ -1,5 +1,5 @@  - + Debug @@ -14,6 +14,7 @@ 8.0.30703 2.0 + v4.6 true @@ -23,6 +24,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -32,6 +34,7 @@ TRACE prompt 4 + false Aliyun.OTS.Samples.Samples.SearchIndexSample @@ -64,7 +67,7 @@ - {AB5EFCA2-53A9-42B5-861E-3FD6F865036B} + {ab5efca2-53a9-42b5-861e-3fd6f865036b} aliyun-tablestore-sdk diff --git a/sample/packages.config b/sample/packages.config index 07048c7..f580c3e 100644 --- a/sample/packages.config +++ b/sample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/sdk/Properties/AssemblyInfo.cs b/sdk/Properties/AssemblyInfo.cs deleted file mode 100644 index 48335ae..0000000 --- a/sdk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Aliyun.TableStore")] -[assembly: AssemblyDescription("Aliyun Table Store SDK for .NET")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alibaba Cloud Computing")] -[assembly: AssemblyProduct("Aliyun.TableStore")] -[assembly: AssemblyCopyright("Copyright (c) 2009-2018 aliyun.com")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("AB5EFCA2-53A9-42B5-861E-3FD6F865036B")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0")] -[assembly: AssemblyFileVersion("4.0.0")] diff --git a/sdk/aliyun-tablestore-sdk.csproj b/sdk/aliyun-tablestore-sdk.csproj index b746a90..3ee5236 100644 --- a/sdk/aliyun-tablestore-sdk.csproj +++ b/sdk/aliyun-tablestore-sdk.csproj @@ -1,10 +1,8 @@ - - - + + netstandard2.0;net46 Debug AnyCPU - {AB5EFCA2-53A9-42B5-861E-3FD6F865036B} Library Properties Aliyun.TableStore @@ -16,7 +14,7 @@ true full false - bin\Debug\ + DEBUG;TRACE prompt 4 @@ -33,222 +31,8 @@ 4 - - - ..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.dll - - - ..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.Serialization.dll - - - - - - - ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll - - - ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From fe241fb1191f93f31f6c4afb126ac36a90ab1676 Mon Sep 17 00:00:00 2001 From: Summer Date: Sat, 27 Apr 2019 21:55:39 +0800 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71c736c..e5c6fab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,29 @@ language: csharp solution: aliyun-tablestore-csharp-sdk.sln -mono: - - latest - - 4.2.1 - - 4.0.0 - - 3.12.0 +dotnet: 2.0.0 +before_install: + - dotnet --version + - phantomjs --version + script: + - dotnet restore + - dotnet run ip http://1212.ip138.com/ic.asp png + - dotnet run acfun http://www.acfun.cn/ jpg 20 + - dotnet run bilibili https://www.bilibili.com jpg 20 + - dotnet run youtube https://www.youtube.com jpg 20 + - dotnet run google https://www.google.com + after_script: + - cd download + - git init + - git config user.name "${U_NAME}" + - git config user.email "${U_EMAIL}" + - git add . + - git commit -m "add imgs" + - git remote add orginimgs "https://${GH_TOKEN}@${GH_REF}" + - export current_date='date +%Y%m%d' + - echo "current_date:$($current_date)" + - git push --force --quiet orginimgs master:gh-pages + - git push --force --quiet orginimgs master:gh-pages_$($current_date) + +branches: + only: + - master From a15abd70fd60022ab17c2e517f9b084e3eda7eee Mon Sep 17 00:00:00 2001 From: John Date: Sat, 27 Apr 2019 22:08:09 +0800 Subject: [PATCH 3/3] update .travis.yml --- .travis.yml | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71c736c..b48c76c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,29 @@ language: csharp -solution: aliyun-tablestore-csharp-sdk.sln -mono: - - latest - - 4.2.1 - - 4.0.0 - - 3.12.0 +dist: trusty +dotnet: 2.0.0 +before_install: + - dotnet --version + - phantomjs --version + script: + - dotnet restore + - dotnet run ip http://1212.ip138.com/ic.asp png + - dotnet run acfun http://www.acfun.cn/ jpg 20 + - dotnet run bilibili https://www.bilibili.com jpg 20 + - dotnet run youtube https://www.youtube.com jpg 20 + - dotnet run google https://www.google.com + after_script: + - cd download + - git init + - git config user.name "${U_NAME}" + - git config user.email "${U_EMAIL}" + - git add . + - git commit -m "add imgs" + - git remote add orginimgs "https://${GH_TOKEN}@${GH_REF}" + - export current_date='date +%Y%m%d' + - echo "current_date:$($current_date)" + - git push --force --quiet orginimgs master:gh-pages + - git push --force --quiet orginimgs master:gh-pages_$($current_date) + +branches: + only: + - master \ No newline at end of file