Skip to content

Commit 4d4df92

Browse files
binary2015novbinary2015nov
committed
sync with source
2 parents 2b93e5e + 1c878f8 commit 4d4df92

8 files changed

Lines changed: 55 additions & 46 deletions

File tree

‎NuGet.Core/ServiceStack.Aws.Core/servicestack.aws.core.nuspec‎

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

‎NuGet/ServiceStack.Aws.Core/servicestack.aws.core.nuspec‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata>
4+
<id>ServiceStack.Aws.Core</id>
5+
<title>ServiceStack.Aws.Core .NET Standard 2.0</title>
6+
<version>5.0.0</version>
7+
<authors>ServiceStack</authors>
8+
<owners>ServiceStack</owners>
9+
<description>
10+
.NET Standard 2.0 version of ServiceStack.Aws
11+
</description>
12+
<projectUrl>https://github.com/ServiceStack/ServiceStack</projectUrl>
13+
<licenseUrl>https://servicestack.net/terms</licenseUrl>
14+
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
15+
<tags>ServiceStack AWS Amazon WebServices DynamoDb S3 SQS Cache CacheClient</tags>
16+
<language>en-US</language>
17+
<copyright>ServiceStack and contributors</copyright>
18+
<dependencies>
19+
<group targetFramework=".netstandard2.0">
20+
<dependency id="System.ServiceModel.Primitives" version="[4.4.0, )" />
21+
<dependency id="AWSSDK.Core" version="[3.3.21.6, )" />
22+
<dependency id="AWSSDK.DynamoDBv2" version="[3.3.5, )" />
23+
<dependency id="AWSSDK.S3" version="[3.3.16.2, )" />
24+
<dependency id="AWSSDK.SQS" version="[3.3.3.2, )" />
25+
<dependency id="ServiceStack.Core" version="5.0" />
26+
</group>
27+
</dependencies>
28+
</metadata>
29+
<files>
30+
<file src="lib\**\*.*" target="lib" />
31+
<file src="..\..\src\ServiceStack.Aws\**\*.cs" target="src" />
32+
</files>
33+
</package>

‎NuGet/ServiceStack.Aws/servicestack.aws.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
<copyright>ServiceStack and contributors</copyright>
1717
<dependencies>
1818
<group targetFramework="net45">
19-
<dependency id="AWSSDK.Core" version="[3.3.21, )" />
19+
<dependency id="AWSSDK.Core" version="[3.3.21.6, )" />
2020
<dependency id="AWSSDK.DynamoDBv2" version="[3.3.5, )" />
21-
<dependency id="AWSSDK.S3" version="[3.3.15, )" />
21+
<dependency id="AWSSDK.S3" version="[3.3.16.2, )" />
2222
<dependency id="AWSSDK.SQS" version="[3.3.3.2, )" />
2323
<dependency id="ServiceStack" version="5.1.0" />
2424
</group>
2525
<group targetFramework=".netstandard2.0">
26-
<dependency id="System.ServiceModel.Primitives" version="[4.3.0, )" />
27-
<dependency id="AWSSDK.Core" version="[3.3.21, )" />
26+
<dependency id="System.ServiceModel.Primitives" version="[4.4.0, )" />
27+
<dependency id="AWSSDK.Core" version="[3.3.21.6, )" />
2828
<dependency id="AWSSDK.DynamoDBv2" version="[3.3.5, )" />
29-
<dependency id="AWSSDK.S3" version="[3.3.15, )" />
29+
<dependency id="AWSSDK.S3" version="[3.3.16.2, )" />
3030
<dependency id="AWSSDK.SQS" version="[3.3.3.2, )" />
3131
<dependency id="ServiceStack" version="5.1.0" />
3232
</group>

‎build/build.proj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,12 @@
8585
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Aws/servicestack.aws.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
8686
LogStandardErrorAsError="true" />
8787

88+
<!-- ServiceStack.Aws.Core -->
89+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Aws.Core/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Aws.Core/lib/netstandard2.0')" />
90+
<Copy SourceFiles="%(AwsCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Aws.Core/lib/netstandard2.0" />
91+
92+
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Aws.Core/servicestack.aws.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
93+
LogStandardErrorAsError="true" />
94+
8895
</Target>
8996
</Project>

‎src/ServiceStack.Aws.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2003
4+
VisualStudioVersion = 15.0.27130.2010
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{91F39E88-36DC-41BA-9B0A-27B7818F76C2}"
77
ProjectSection(SolutionItems) = preProject
88
..\build\build.bat = ..\build\build.bat
99
..\build\build.proj = ..\build\build.proj
10+
..\NuGet\ServiceStack.Aws.Core\servicestack.aws.core.nuspec = ..\NuGet\ServiceStack.Aws.Core\servicestack.aws.core.nuspec
1011
..\NuGet\ServiceStack.Aws\servicestack.aws.nuspec = ..\NuGet\ServiceStack.Aws\servicestack.aws.nuspec
1112
..\build\start-local-dynamodb.bat = ..\build\start-local-dynamodb.bat
1213
EndProjectSection

‎src/ServiceStack.Aws/ServiceStack.Aws.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="AWSSDK.Core" Version="3.3.21" />
24+
<PackageReference Include="AWSSDK.Core" Version="3.3.21.6" />
2525
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.5" />
26-
<PackageReference Include="AWSSDK.S3" Version="3.3.15" />
26+
<PackageReference Include="AWSSDK.S3" Version="3.3.16.2" />
2727
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
2828
</ItemGroup>
2929

‎tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="AWSSDK.Core" Version="3.3.21" />
20+
<PackageReference Include="AWSSDK.Core" Version="3.3.21.6" />
2121
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.5" />
22-
<PackageReference Include="AWSSDK.S3" Version="3.3.15" />
22+
<PackageReference Include="AWSSDK.S3" Version="3.3.16.2" />
2323
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
2525
<PackageReference Include="NUnit" Version="3.9.0" />
@@ -51,7 +51,7 @@
5151
</PropertyGroup>
5252

5353
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
54-
<PackageReference Include="System.Data.Common" Version="4.*" />
54+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
5555
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
5656

5757
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />

‎tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<PackageReference Include="NUnit" Version="3.9.0" />
2323
<PackageReference Include="AWSSDK.Core" Version="3.3.21" />
2424
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.5" />
25-
<PackageReference Include="AWSSDK.S3" Version="3.3.15" />
25+
<PackageReference Include="AWSSDK.S3" Version="3.3.16.2" />
2626
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
27+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
2728
<ProjectReference Include="..\..\src\ServiceStack.Aws\ServiceStack.Aws.csproj" />
2829
</ItemGroup>
2930

@@ -51,7 +52,7 @@
5152
</PropertyGroup>
5253

5354
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
54-
<PackageReference Include="System.Data.Common" Version="4.*" />
55+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
5556
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
5657

5758
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />

0 commit comments

Comments
 (0)