Skip to content

Commit

Permalink
reduce tfms
Browse files Browse the repository at this point in the history
  • Loading branch information
bruno-garcia committed Jul 25, 2021
1 parent d574495 commit 1b5ad60
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 51 deletions.
17 changes: 3 additions & 14 deletions src/Sentry.Tunnel/Sentry.Tunnel.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.0;netstandard2.0</TargetFrameworks>
<PackageTags>$(PackageTags);AspNetCore;MVC</PackageTags>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<PackageTags>$(PackageTags);Sentry Proxy;Envelopes</PackageTags>
<PackageId>Sentry.Tunnel</PackageId>
<AssemblyName>Sentry.Tunnel</AssemblyName>
<RootNamespace>Sentry.Tunnel</RootNamespace>
<Description>Official Tunnel middleware for Sentry.</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
<PackageReference Include="System.Text.Json" Version="4.6.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand Down
40 changes: 3 additions & 37 deletions test/Sentry.Tunnel.Tests/Sentry.Tunnel.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,47 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="coverlet.collector" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
</ItemGroup>

<!-- Run netcoreapp3.0 against netstandard2.1 target of Sentry -->
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ProjectReference Update="../../src/Sentry/Sentry.csproj" SetTargetFramework="TargetFramework=netstandard2.1" />
<!-- NET Core's built-in STJ is lower version which causes conflicts, so we have to explicitly reference it -->
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<!-- Ben.Demystifier uses S.R.M v5 and also requires it via package reference when on nca3.x -->
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Sentry.Tunnel\Sentry.Tunnel.csproj" />
<ProjectReference Include="../../src/Sentry.Tunnel/Sentry.Tunnel.csproj" />
<ProjectReference Include="../Sentry.Testing/Sentry.Testing.csproj" />
</ItemGroup>

</Project>

0 comments on commit 1b5ad60

Please sign in to comment.