Skip to content

Azurecore: Fixes upgrading azure core dependency to latest #4819

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

Merged
merged 6 commits into from
Oct 18, 2024
Merged

Azurecore: Fixes upgrading azure core dependency to latest #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19c6ac0
Upgrading azure core depdependency to 1.44.1
kirankumarkolli Oct 18, 2024
ec45ca3
Fixing build failures
kirankumarkolli Oct 18, 2024
24a921f
Merge branch 'master' into users/kirankk/azure.core_upgrade
kirankumarkolli Oct 18, 2024
74649e9
UT fix
kirankumarkolli Oct 18, 2024
eb0d11c
Fixing encryption project build errors
kirankumarkolli Oct 18, 2024
cd89960
cleaning System.Net.Http
kirankumarkolli Oct 18, 2024
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
3 changes: 1 addition & 2 deletions Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.38.0" />
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions ...ustom.Performance.Tests/Microsoft.Azure.Cosmos.Encryption.Custom.Performance.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.19.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/src/CosmosClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace Microsoft.Azure.Cosmos
using Microsoft.Azure.Cosmos.Tracing;
using Microsoft.Azure.Cosmos.Tracing.TraceData;
using Microsoft.Azure.Documents;
using ResourceType = Documents.ResourceType;

/// <summary>
/// Provides a client-side logical representation of the Azure Cosmos DB account.
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/src/DocumentClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ namespace Microsoft.Azure.Cosmos
using Microsoft.Azure.Documents.FaultInjection;
using Microsoft.Azure.Documents.Routing;
using Newtonsoft.Json;
using ResourceType = Documents.ResourceType;

/// <summary>
/// Provides a client-side logical representation for the Azure Cosmos DB service.
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.19.0" />
<PackageReference Include="Azure.Core" Version="1.44.1" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
Expand Down
1 change: 0 additions & 1 deletion ...os/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="Azure.Core" Version="1.19.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion .../Microsoft.Azure.Cosmos.Performance.Tests/Microsoft.Azure.Cosmos.Performance.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -21,6 +21,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Linq" Version="4.3.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DirectContractTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ public void ProjectPackageDependenciesTest()
{ "System.Collections.Immutable", new Version(1, 7, 0) },
{ "System.Numerics.Vectors", new Version(4, 5, 0) },
{ "Newtonsoft.Json", new Version(10, 0, 2) },
{ "Microsoft.Bcl.AsyncInterfaces", new Version(1, 0, 0) },
{ "Microsoft.Bcl.AsyncInterfaces", new Version(6, 0, 0) },
{ "System.Configuration.ConfigurationManager", new Version(6, 0, 0) },
{ "System.Memory", new Version(4, 5, 5) },
{ "System.Buffers", new Version(4, 5, 1) },
{ "System.Runtime.CompilerServices.Unsafe", new Version(6, 0, 0) },
{ "System.Threading.Tasks.Extensions", new Version(4, 5, 4) },
{ "System.ValueTuple", new Version(4, 5, 0) },
{ "Microsoft.Bcl.HashCode", new Version(1, 1, 0) },
{ "Azure.Core", new Version(1, 19, 0) },
{ "Azure.Core", new Version(1, 44, 1) },
{ "System.Diagnostics.DiagnosticSource", new Version(8, 0, 1) },
{ "System.Net.Http", new Version(4, 3, 4) },
{ "System.Text.RegularExpressions", new Version(4, 3, 1) },
Expand All @@ -142,7 +142,7 @@ public void ProjectPackageDependenciesTest()
}

/// <summary>
/// Ignoring HybridRow dependency check as it is using System.Runtime.CompilerServices.Unsafe 4.5.3 and Azure.Core 1.19.0 needs >=4.6.0 version of the same
/// Ignoring HybridRow dependency check as it is using System.Runtime.CompilerServices.Unsafe 4.5.3 and Azure.Core 1.44.1 needs >=4.6.0 version of the same
/// </summary>
[TestMethod]
public void PackageDependenciesTest()
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosAuthorizationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Microsoft.Azure.Cosmos.Tests
using Microsoft.Azure.Documents.Collections;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using ResourceType = Documents.ResourceType;

[TestClass]
public class CosmosAuthorizationTests
Expand Down
1 change: 0 additions & 1 deletion ...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.19.0" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.7.1" />
Expand Down
Loading