Skip to content

Commit 70f29e3

Browse files
jon-armenjon-armen
committed
- Removing obsolete netcoreapp2.0 runtime
- Updating AWSSDK to 3.7.x - Updating testing references
1 parent e9e583e commit 70f29e3

File tree

7 files changed

+35
-59
lines changed

7 files changed

+35
-59
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
version: [net452, netcoreapp2.0, netcoreapp3.1]
23+
version: [net452, netcoreapp3.1]
2424

2525
steps:
2626
- name: Checkout repository
@@ -43,6 +43,4 @@ jobs:
4343
- name: Run tests
4444
run: >-
4545
dotnet test sdk/test/UnitTests/bin/Release/${{matrix.version}}/AWSXRayRecorder.UnitTests.dll
46-
--configuration Release
47-
--no-build
4846
--logger "console;verbosity=detailed"

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '1.0.{build}'
2-
image: Visual Studio 2019
2+
image: Visual Studio 2022
33
init:
44
# Good practise, because Windows line endings are different from Unix/Linux ones
55
- cmd: git config --global core.autocrlf true

‎sdk/src/Core/AWSXRayRecorder.Core.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
41+
<PackageReference Include="AWSSDK.Core" Version="3.7.8.6" />
4242
</ItemGroup>
4343

4444
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
45-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
46-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
45+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
46+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
4847
</ItemGroup>
4948

5049
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

‎sdk/src/Handlers/EntityFramework/AWSXRayRecorder.Handlers.EntityFramework.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
40-
<PackageReference Include="EntityFramework" Version="6.2.0" />
40+
<PackageReference Include="EntityFramework" Version="6.4.4" />
4141
<Compile Remove="AWSXRayInterceptorExtensions.cs" />
4242
<Compile Remove="EFInterceptor.cs" />
4343
</ItemGroup>

‎sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
<PropertyGroup>
5-
<TargetFrameworks>net45;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
66
<Company>Amazon.com, Inc</Company>
77
<Product>Amazon Web Service X-Ray Recorder</Product>
88
<Copyright>Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
@@ -13,17 +13,17 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
17-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
18-
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
19-
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
20-
<PackageReference Include="AWSSDK.XRay" Version="3.5.2.16" />
21-
<PackageReference Include="Moq" Version="4.7.137" />
16+
<PackageReference Include="AWSSDK.Core" Version="3.7.8.6" />
17+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.7" />
18+
<PackageReference Include="AWSSDK.Lambda" Version="3.7.9.4" />
19+
<PackageReference Include="AWSSDK.S3" Version="3.7.8.4" />
20+
<PackageReference Include="AWSSDK.XRay" Version="3.7.0.132" />
21+
<PackageReference Include="Moq" Version="4.17.2" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
25-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
26-
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
25+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
26+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\..\src\Core\AWSXRayRecorder.Core.csproj" />

‎sdk/test/SmokeTests/AWSXRayRecorder.SmokeTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
55
<Company>Amazon.com, Inc</Company>
66
<Product>Amazon Web Service X-Ray Recorder</Product>
77
<Copyright>Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
@@ -17,9 +17,9 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="AWSXRayRecorder.Core" Version="*" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
21-
<PackageReference Include="Moq" Version="4.7.137" />
22-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
23-
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
21+
<PackageReference Include="Moq" Version="4.17.2" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
23+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
2424
</ItemGroup>
2525
</Project>

‎sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
3+
44
<PropertyGroup>
5-
<TargetFrameworks>net452;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
66
<Company>Amazon.com, Inc</Company>
77
<Product>Amazon Web Service X-Ray Recorder</Product>
88
<Copyright>Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
@@ -12,7 +12,7 @@
1212
<AssemblyOriginatorKeyFile>../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>
1313
</PropertyGroup>
1414

15-
15+
1616
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
1717
<DefineConstants>TRACE;DEBUG</DefineConstants>
1818
<NoWarn>0618;1701;1702;1705</NoWarn>
@@ -26,15 +26,6 @@
2626
<DefineConstants>NET45</DefineConstants>
2727
</PropertyGroup>
2828

29-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
30-
<DefineConstants>TRACE;DEBUG</DefineConstants>
31-
<NoWarn>0618;1701;1702;1705</NoWarn>
32-
</PropertyGroup>
33-
34-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.0|AnyCPU'">
35-
<NoWarn>0618;1701;1702;1705</NoWarn>
36-
</PropertyGroup>
37-
3829
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
3930
<DefineConstants>TRACE;DEBUG</DefineConstants>
4031
<NoWarn>0618;1701;1702;1705</NoWarn>
@@ -45,35 +36,23 @@
4536
</PropertyGroup>
4637

4738
<ItemGroup>
48-
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
49-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
50-
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
51-
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
52-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.5.0.26" />
53-
<PackageReference Include="Moq" Version="4.7.137" />
54-
</ItemGroup>
55-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
56-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.0">
57-
</PackageReference>
58-
59-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0">
60-
</PackageReference>
61-
62-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
63-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
64-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
65-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0" />
39+
<PackageReference Include="AWSSDK.Core" Version="3.7.8.6" />
40+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.7" />
41+
<PackageReference Include="AWSSDK.Lambda" Version="3.7.9.4" />
42+
<PackageReference Include="AWSSDK.S3" Version="3.7.8.4" />
43+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.3.32" />
44+
<PackageReference Include="Moq" Version="4.17.2" />
6645
</ItemGroup>
6746
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
6847
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
6948
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
7049
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
7150
</ItemGroup>
7251
<ItemGroup>
73-
<PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
74-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
75-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
76-
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
52+
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
53+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
54+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
55+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
7756
</ItemGroup>
7857
<ItemGroup>
7958
<ProjectReference Include="..\..\src\Core\AWSXRayRecorder.Core.csproj" />
@@ -93,7 +72,7 @@
9372
</ItemGroup>
9473
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
9574
<PackageReference Include="EntityFramework" Version="6.4.4" />
96-
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.113" />
75+
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.115.5" />
9776
<Compile Remove="Tools\MockHttpRequestNetcore.cs" />
9877
<Compile Remove="Tools\MockHttpRequestFactoryNetcore.cs" />
9978
<Compile Remove="Tools\CustomWebResponse.cs" />

0 commit comments

Comments
 (0)