Skip to content

Commit 80e38b9

Browse files
Azurecore: Fixes upgrading azure core dependency to latest (#4819)
Azure.Core: Fixed upgrading azure core dependency to 1.44.1 Changes - ResourceType: Conflict between Azure.Core and Microsoft.Azure.Cosmos.Documents - Microsoft.Bcl.AsyncInterfaces: Azure.Core needs at-least 6.0.0 (as Azure core upgraded part of minor version, we are good as well) - Microsoft.Azure.Cosmos.Encryption.Custom: Direct dependency on Azure.Core removed (now its transitive) - Microsoft.Azure.Cosmos.Encryption.Custom.Performance.Tests: `NU1903` added Newtonsoft.Json dependency - Performance project: `NU1903` Newtonsoft dependency upgraded
1 parent ac9d503 commit 80e38b9

File tree

11 files changed

+12
-11
lines changed

11 files changed

+12
-11
lines changed

Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Azure.Core" Version="1.38.0" />
5049
<PackageReference Include="Azure.Identity" Version="1.11.4" />
5150
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
52-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
51+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
5352
</ItemGroup>
5453

5554
<ItemGroup>

Microsoft.Azure.Cosmos.Encryption.Custom/tests/Microsoft.Azure.Cosmos.Encryption.Custom.Performance.Tests/Microsoft.Azure.Cosmos.Encryption.Custom.Performance.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
2020
<PackageReference Include="Moq" Version="4.13.1" />
21+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2122
</ItemGroup>
2223

2324
<ItemGroup>

Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="Azure.Core" Version="1.19.0" />
4645
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
4746
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
4847
</ItemGroup>

Microsoft.Azure.Cosmos/src/CosmosClient.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ namespace Microsoft.Azure.Cosmos
2323
using Microsoft.Azure.Cosmos.Tracing;
2424
using Microsoft.Azure.Cosmos.Tracing.TraceData;
2525
using Microsoft.Azure.Documents;
26+
using ResourceType = Documents.ResourceType;
2627

2728
/// <summary>
2829
/// Provides a client-side logical representation of the Azure Cosmos DB account.

Microsoft.Azure.Cosmos/src/DocumentClient.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ namespace Microsoft.Azure.Cosmos
3232
using Microsoft.Azure.Documents.FaultInjection;
3333
using Microsoft.Azure.Documents.Routing;
3434
using Newtonsoft.Json;
35+
using ResourceType = Documents.ResourceType;
3536

3637
/// <summary>
3738
/// Provides a client-side logical representation for the Azure Cosmos DB service.

Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@
112112
</ItemGroup>
113113

114114
<ItemGroup>
115-
<PackageReference Include="Azure.Core" Version="1.19.0" />
115+
<PackageReference Include="Azure.Core" Version="1.44.1" />
116116
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
117117
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
118118
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
119-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
119+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
120120
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
121121
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" />
122122
<PackageReference Include="System.Net.Http" Version="4.3.4" />

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
6666
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
6767
<PackageReference Include="System.Reflection" Version="4.3.0" />
68-
<PackageReference Include="Azure.Core" Version="1.19.0" />
6968
</ItemGroup>
7069

7170
<ItemGroup>

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Performance.Tests/Microsoft.Azure.Cosmos.Performance.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -21,6 +21,7 @@
2121
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
2222
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
2323
<PackageReference Include="Moq" Version="4.13.1" />
24+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2425
<PackageReference Include="System.Linq" Version="4.3.0" />
2526
</ItemGroup>
2627

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DirectContractTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ public void ProjectPackageDependenciesTest()
119119
{ "System.Collections.Immutable", new Version(1, 7, 0) },
120120
{ "System.Numerics.Vectors", new Version(4, 5, 0) },
121121
{ "Newtonsoft.Json", new Version(10, 0, 2) },
122-
{ "Microsoft.Bcl.AsyncInterfaces", new Version(1, 0, 0) },
122+
{ "Microsoft.Bcl.AsyncInterfaces", new Version(6, 0, 0) },
123123
{ "System.Configuration.ConfigurationManager", new Version(6, 0, 0) },
124124
{ "System.Memory", new Version(4, 5, 5) },
125125
{ "System.Buffers", new Version(4, 5, 1) },
126126
{ "System.Runtime.CompilerServices.Unsafe", new Version(6, 0, 0) },
127127
{ "System.Threading.Tasks.Extensions", new Version(4, 5, 4) },
128128
{ "System.ValueTuple", new Version(4, 5, 0) },
129129
{ "Microsoft.Bcl.HashCode", new Version(1, 1, 0) },
130-
{ "Azure.Core", new Version(1, 19, 0) },
130+
{ "Azure.Core", new Version(1, 44, 1) },
131131
{ "System.Diagnostics.DiagnosticSource", new Version(8, 0, 1) },
132132
{ "System.Net.Http", new Version(4, 3, 4) },
133133
{ "System.Text.RegularExpressions", new Version(4, 3, 1) },
@@ -142,7 +142,7 @@ public void ProjectPackageDependenciesTest()
142142
}
143143

144144
/// <summary>
145-
/// 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
145+
/// 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
146146
/// </summary>
147147
[TestMethod]
148148
public void PackageDependenciesTest()

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosAuthorizationTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace Microsoft.Azure.Cosmos.Tests
2121
using Microsoft.Azure.Documents.Collections;
2222
using Microsoft.VisualStudio.TestTools.UnitTesting;
2323
using Moq;
24+
using ResourceType = Documents.ResourceType;
2425

2526
[TestClass]
2627
public class CosmosAuthorizationTests

0 commit comments

Comments
 (0)