Skip to content

Commit 8659350

Browse files
committed
include dotnetcore projects into aliyun-oss-sdk.sln
1 parent 6f408eb commit 8659350

File tree

5 files changed

+41
-7
lines changed

5 files changed

+41
-7
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
language: csharp
2-
solution: aliyun-oss-sdk-dotnetcore.sln
3-
mono: none
4-
dotnet: 2.0.0
2+
solution: aliyun-oss-sdk.sln
3+
4+
matrix:
5+
include:
6+
- dotnet: 2.0.0
7+
mono: latest
8+
59
env:
610
global:
711
- MONO_IOMAP=all
812
script:
9-
- dotnet restore aliyun-oss-sdk-dotnetcore.sln
13+
- dotnet restore aliyun-oss-sdk.sln

aliyun-oss-sdk.sln

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ Microsoft Visual Studio Solution File, Format Version 11.00
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk", "sdk\aliyun-oss-sdk.csproj", "{67BDC800-084C-4F84-8A80-661B5AFE499A}"
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk-samples", "samples\aliyun-oss-sdk-samples.csproj", "{ADC5BCC2-3677-4CD5-9ED3-5BBA427519DD}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{67BDC800-084C-4F84-8A80-661B5AFE499A} = {67BDC800-084C-4F84-8A80-661B5AFE499A}
9-
EndProjectSection
107
EndProject
118
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk-test", "test\aliyun-oss-sdk-test.csproj", "{597D1FDD-CC1D-41CB-B914-A9F60486D9DC}"
129
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk-dotnetcore", "sdk\aliyun-oss-sdk-dotnetcore.csproj", "{2F92F310-2914-4A3D-BE56-5C894F9A363F}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk-samples-dotnetcore", "samples\aliyun-oss-sdk-samples-dotnetcore.csproj", "{E853A3AE-9C94-42B3-AB9C-37CE080BC037}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-oss-sdk-test-dotnetcore", "test\aliyun-oss-sdk-test-dotnetcore.csproj", "{9163E33C-28D1-4484-90C9-57816A6464E5}"
15+
EndProject
1316
Global
1417
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1518
Debug|Any CPU = Debug|Any CPU
@@ -38,6 +41,30 @@ Global
3841
{ADC5BCC2-3677-4CD5-9ED3-5BBA427519DD}.Release|Any CPU.Build.0 = Release|Any CPU
3942
{ADC5BCC2-3677-4CD5-9ED3-5BBA427519DD}.Release|x86.ActiveCfg = Release|x86
4043
{ADC5BCC2-3677-4CD5-9ED3-5BBA427519DD}.Release|x86.Build.0 = Release|x86
44+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Debug|x86.ActiveCfg = Debug|Any CPU
47+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Debug|x86.Build.0 = Debug|Any CPU
48+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Release|x86.ActiveCfg = Release|Any CPU
51+
{2F92F310-2914-4A3D-BE56-5C894F9A363F}.Release|x86.Build.0 = Release|Any CPU
52+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Debug|x86.ActiveCfg = Debug|Any CPU
55+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Debug|x86.Build.0 = Debug|Any CPU
56+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Release|x86.ActiveCfg = Release|Any CPU
59+
{E853A3AE-9C94-42B3-AB9C-37CE080BC037}.Release|x86.Build.0 = Release|Any CPU
60+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
62+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Debug|x86.ActiveCfg = Debug|Any CPU
63+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Debug|x86.Build.0 = Debug|Any CPU
64+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Release|x86.ActiveCfg = Release|Any CPU
67+
{9163E33C-28D1-4484-90C9-57816A6464E5}.Release|x86.Build.0 = Release|Any CPU
4168
EndGlobalSection
4269
GlobalSection(MonoDevelopProperties) = preSolution
4370
StartupItem = samples\aliyun-oss-sdk-samples.csproj

samples/aliyun-oss-sdk-samples.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<BootstrapperEnabled>true</BootstrapperEnabled>
3939
<ProductVersion>8.0.30703</ProductVersion>
4040
<SchemaVersion>2.0</SchemaVersion>
41+
<ProjectAssetsFile>notexistfile</ProjectAssetsFile>
4142
</PropertyGroup>
4243
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
4344
<PlatformTarget>AnyCPU</PlatformTarget>

sdk/aliyun-oss-sdk.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<BootstrapperEnabled>true</BootstrapperEnabled>
4242
<ProductVersion>8.0.30703</ProductVersion>
4343
<SchemaVersion>2.0</SchemaVersion>
44+
<ProjectAssetsFile>notexistfile</ProjectAssetsFile>
4445
</PropertyGroup>
4546
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
4647
<PlatformTarget>AnyCPU</PlatformTarget>

test/aliyun-oss-sdk-test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<TargetFrameworkProfile />
1313
<ProductVersion>8.0.30703</ProductVersion>
1414
<SchemaVersion>2.0</SchemaVersion>
15+
<ProjectAssetsFile>notexistfile</ProjectAssetsFile>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>

0 commit comments

Comments
 (0)