Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete netcoreapp2.0 runtime #232

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Remove obsolete netcoreapp2.0 runtime #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net452, netcoreapp2.0, netcoreapp3.1]
version: [net452, netcoreapp3.1]

steps:
- name: Checkout repository
Expand All @@ -43,6 +43,4 @@ jobs:
- name: Run tests
run: >-
dotnet test sdk/test/UnitTests/bin/Release/${{matrix.version}}/AWSXRayRecorder.UnitTests.dll
--configuration Release
--no-build
--logger "console;verbosity=detailed"
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: '1.0.{build}'
image: Visual Studio 2019
image: Visual Studio 2022
init:
# Good practise, because Windows line endings are different from Unix/Linux ones
- cmd: git config --global core.autocrlf true
Expand Down
7 changes: 3 additions & 4 deletions sdk/src/Core/AWSXRayRecorder.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
<PackageReference Include="AWSSDK.Core" Version="3.7.8.6" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/Handlers/EntityFramework/AWSXRayRecorder.Handlers.EntityFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="EntityFramework" Version="6.2.0" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<Compile Remove="AWSXRayInterceptorExtensions.cs" />
<Compile Remove="EFInterceptor.cs" />
</ItemGroup>
Expand Down
19 changes: 9 additions & 10 deletions sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


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

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.5.2.16" />
<PackageReference Include="Moq" Version="4.7.137" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.7" />
<PackageReference Include="AWSSDK.Lambda" Version="3.7.9.4" />
<PackageReference Include="AWSSDK.S3" Version="3.7.8.4" />
<PackageReference Include="AWSSDK.XRay" Version="3.7.0.132" />
<PackageReference Include="Moq" Version="4.17.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Core\AWSXRayRecorder.Core.csproj" />
Expand Down
10 changes: 5 additions & 5 deletions sdk/test/SmokeTests/AWSXRayRecorder.SmokeTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
<PackageReference Include="AWSXRayRecorder.Core" Version="*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Moq" Version="4.7.137" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
</ItemGroup>
</Project>
48 changes: 13 additions & 35 deletions sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">


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


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

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
<NoWarn>0618;1701;1702;1705</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.0|AnyCPU'">
<NoWarn>0618;1701;1702;1705</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
<NoWarn>0618;1701;1702;1705</NoWarn>
Expand All @@ -45,35 +36,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.5.0.26" />
<PackageReference Include="Moq" Version="4.7.137" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.0">
</PackageReference>

<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0">
</PackageReference>

<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.7" />
<PackageReference Include="AWSSDK.Lambda" Version="3.7.9.4" />
<PackageReference Include="AWSSDK.S3" Version="3.7.8.4" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.3.32" />
<PackageReference Include="Moq" Version="4.17.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Core\AWSXRayRecorder.Core.csproj" />
Expand All @@ -93,7 +71,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.113" />
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.115.5" />
<Compile Remove="Tools\MockHttpRequestNetcore.cs" />
<Compile Remove="Tools\MockHttpRequestFactoryNetcore.cs" />
<Compile Remove="Tools\CustomWebResponse.cs" />
Expand Down