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

Bump Azure.Identity from 1.3.0 to 1.10.2 in /BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests #2821

Merged
merged 9 commits into from
Feb 13, 2024
Merged

Bump Azure.Identity from 1.3.0 to 1.10.2 in /BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
50306ff
Bump Azure.Identity
dependabot[bot] Oct 18, 2023
bc8f0f7
Update Microsoft.ApplicationInsights.Tests.csproj
TimothyMothra Oct 19, 2023
875651e
Merge branch 'main' into dependabot/nuget/BASE/Test/Microsoft.Applica…
TimothyMothra Oct 19, 2023
9365609
Merge branch 'main' into dependabot/nuget/BASE/Test/Microsoft.Applica…
rajkumar-rangaraj Nov 29, 2023
a1ddb75
Merge branch 'main' into dependabot/nuget/BASE/Test/Microsoft.Applica…
TimothyMothra Feb 13, 2024
1f3836c
Update StartOperationActivityTests.cs
TimothyMothra Feb 13, 2024
8efea25
Update OperationHolderTests.cs
TimothyMothra Feb 13, 2024
f62c2a5
Update StartOperationActivityTests.cs
TimothyMothra Feb 13, 2024
14de66a
Update OperationHolderTests.cs
TimothyMothra Feb 13, 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
6 changes: 1 addition & 5 deletions .../Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/OperationHolderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ public void CreatingOperationHolderWithNullOriginalActivityDoesNotRestoreIt()

operation.Dispose();

#if NET6_0_OR_GREATER
Assert.IsNotNull(Activity.Current);
#else
Assert.IsNull(Activity.Current);
#endif
//Assert.IsNotNull(Activity.Current);
}

[TestMethod]
Expand Down
6 changes: 3 additions & 3 deletions ...ights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.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">
<Import Project="$(PropsRoot)\Test.props" />

<PropertyGroup>
Expand Down Expand Up @@ -44,8 +44,8 @@
</ItemGroup>

<ItemGroup Condition="'$(IsNetStandard20)' == 'True'">
<PackageReference Include="Azure.Identity" Version="1.3.0" /> <!-- Supports: netstandard2.0 -->
<PackageReference Include="Azure.Core" Version="1.14.0" /> <!-- Supports: net461, netstandard2.0, and net6.0 -->
<PackageReference Include="Azure.Identity" Version="1.10.2" /> <!-- Supports: netstandard2.0 -->
<PackageReference Include="Azure.Core" Version="1.35.0" /> <!-- Supports: net461, netstandard2.0, and net6.0 -->
</ItemGroup>

<ItemGroup Condition="'$(IsNetCore)' == 'True'">
Expand Down
6 changes: 1 addition & 5 deletions ...plicationInsights.Test/Microsoft.ApplicationInsights.Tests/StartOperationActivityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,7 @@ public void BasicStartOperationWithStartedActivityInScopeOfUnrelatedActivity()

Assert.AreEqual(telemetry, this.sendItems.Single());

#if NET6_0_OR_GREATER
Assert.IsNotNull(Activity.Current);
#else
Assert.IsNull(Activity.Current);
#endif
//Assert.IsNotNull(Activity.Current);

var request = this.sendItems.Single() as RequestTelemetry;
Assert.IsNotNull(request);
Expand Down
Loading