Skip to content

Commit

Permalink
fix: Fixed the dependency mess
Browse files Browse the repository at this point in the history 
Fixed Azure#38857
  • Loading branch information
@svrooij
svrooij committed Sep 21, 2023
1 parent 87cd28b commit c5e195b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 14 deletions.
16 changes: 9 additions & 7 deletions eng/Packages.Data.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@
<PackageReference Update="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Update="System.Collections" Version="4.3.0" />
<PackageReference Update="System.Data.SqlClient" Version="4.3.1" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.7.1" />
<PackageReference Update="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Update="System.Globalization" Version="4.3.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
<PackageReference Update="System.Linq" Version="4.3.0" />
<PackageReference Update="System.Memory.Data" Version="1.0.2" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
<PackageReference Update="System.Reflection.TypeExtensions" Version="[4.5.1, 4.9.0)" />
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
<PackageReference Update="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Update="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Update="System.Runtime" Version="4.3.0" />
Expand All @@ -65,19 +66,20 @@
<PackageReference Update="System.Buffers" Version="4.5.1" />
<PackageReference Update="System.IO.Hashing" Version="6.0.0" />
<PackageReference Update="System.Memory" Version="4.5.4" />
<PackageReference Update="System.Memory.Data" Version="1.0.2" />
<PackageReference Update="System.Memory.Data" Version="7.0.0" />
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Update="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Update="System.Threading.Channels" Version="4.7.1" />
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageReference Update="System.Text.Json" Version="4.7.2" />
<PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" />
<PackageReference Update="System.Text.Json" Version="7.0.3" />
<PackageReference Update="System.Text.Encodings.Web" Version="7.0.0" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />

<!-- Azure SDK packages -->
Expand Down Expand Up @@ -177,7 +179,7 @@
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230920.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20230822.1" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
<PackageReference Update="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20467.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19552.1" PrivateAssets="All" />
Expand Down
32 changes: 25 additions & 7 deletions sdk/core/Azure.Core/src/Azure.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,36 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="System.Numerics.Vectors" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Memory.Data" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net5.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" /> <!-- needed only before .netcore 3.1 -->
<PackageReference Include="System.Numerics.Vectors" /> <!-- it builds without this on higher platforms -->
<PackageReference Include="System.Threading.Tasks.Extensions" /> <!-- support for ValueTask on lower platforms -->
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net5.0' AND '$(TargetFramework)' != 'netcoreapp2.1'">
<PackageReference Include="System.Memory.Data" VersionOverride="6.0.0" />
<PackageReference Include="System.Text.Encodings.Web" VersionOverride="6.0.0" />
<PackageReference Include="System.Text.Json" VersionOverride="6.0.8" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Memory.Data" VersionOverride="1.0.2" />
<PackageReference Include="System.Text.Encodings.Web" VersionOverride="5.0.0" />
<PackageReference Include="System.Text.Json" VersionOverride="5.0.2" />
</ItemGroup>

<!-- Keep System.Diagnostics.DiagnosticSource 4.6.0 for netcoreapp2.1 support. -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="4.6.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="4.7.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" VersionOverride="4.7.1" />
<PackageReference Include="System.Memory.Data" VersionOverride="1.0.2" />
<PackageReference Include="System.Text.Encodings.Web" VersionOverride="4.7.2" />
<PackageReference Include="System.Text.Json" VersionOverride="4.7.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down

0 comments on commit c5e195b

Please sign in to comment.