From cf0fc8ddd9a2368a3d2855dcac50e1bd53b5acf0 Mon Sep 17 00:00:00 2001
From: Stijn Moreels <9039753+stijnmoreels@users.noreply.github.com>
Date: Fri, 26 Jan 2024 06:08:13 +0100
Subject: [PATCH] chore: upgrade to observability v3.0 (#427)

Co-authored-by: Frederik Gheysels <frederik.gheysels@telenet.be>
---
 build/ci-build.yml                                         | 4 ++--
 build/nuget-release.yml                                    | 4 ++--
 build/templates/run-integration-tests.yml                  | 4 ++--
 build/variables/build.yml                                  | 1 +
 src/Arcus.Security.Core/Arcus.Security.Core.csproj         | 7 +------
 .../Arcus.Security.Tests.Integration.csproj                | 2 +-
 src/Arcus.Security.Tests.Integration/IntegrationTest.cs    | 2 +-
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/build/ci-build.yml b/build/ci-build.yml
index 38152bbb..266e1937 100644
--- a/build/ci-build.yml
+++ b/build/ci-build.yml
@@ -53,7 +53,7 @@ stages:
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               versionSuffix: '$(packageVersion)'
-              includePreviewVersions: true
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
           - task: CopyFiles@2
             displayName: 'Copy build artifacts'
             inputs:
@@ -89,7 +89,7 @@ stages:
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Unit'
-              includePreviewVersions: true
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
 
   - stage: IntegrationTests
     displayName: Integration Tests
diff --git a/build/nuget-release.yml b/build/nuget-release.yml
index af5d1c44..c3d656a9 100644
--- a/build/nuget-release.yml
+++ b/build/nuget-release.yml
@@ -39,7 +39,7 @@ stages:
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               version: $(Build.BuildNumber)
-              includePreviewVersions: true
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
           - task: CopyFiles@2
             displayName: 'Copy build artifacts'
             inputs:
@@ -75,7 +75,7 @@ stages:
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Unit'
-              includePreviewVersions: true
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
 
   - stage: IntegrationTests
     displayName: Integration Tests
diff --git a/build/templates/run-integration-tests.yml b/build/templates/run-integration-tests.yml
index c32cf21d..b12ba655 100644
--- a/build/templates/run-integration-tests.yml
+++ b/build/templates/run-integration-tests.yml
@@ -14,7 +14,7 @@ steps:
     inputs:
       packageType: 'sdk'
       version: '$(DotNet.Sdk.VersionBC)'
-      includePreviewVersions: true
+      includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
   - task: Docker@1
     displayName: 'Build Docker image from ${{ parameters.dockerProjectName }}'
     inputs:
@@ -33,7 +33,7 @@ steps:
     parameters:
       dotnetSdkVersion: '$(DotNet.Sdk.Version)'
       projectName: '$(Project).Tests.Integration'
-      includePreviewVersions: true
+      includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
   - task: Bash@3
     inputs:
       targetType: 'inline'
diff --git a/build/variables/build.yml b/build/variables/build.yml
index 88b2bb50..147972a5 100644
--- a/build/variables/build.yml
+++ b/build/variables/build.yml
@@ -2,5 +2,6 @@ variables:
   DotNet.Sdk.Version: '8.0.x'
   # Backwards compatible .NET SDK version
   DotNet.Sdk.VersionBC: '6.0.100'
+  DotNet.Sdk.IncludePreviewVersions: false
   Project: 'Arcus.Security'
   Vm.Image: 'ubuntu-latest'
diff --git a/src/Arcus.Security.Core/Arcus.Security.Core.csproj b/src/Arcus.Security.Core/Arcus.Security.Core.csproj
index f66cf86a..10bbd687 100644
--- a/src/Arcus.Security.Core/Arcus.Security.Core.csproj
+++ b/src/Arcus.Security.Core/Arcus.Security.Core.csproj
@@ -18,11 +18,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Allows (for now) preview packages, as we are referencing Arcus' preview .NET 8 package. -->
-    <NoWarn>NU5104</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
@@ -30,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[3.0.0-preview-1-net8.0,4.0.0)" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[3.0.0,4.0.0)" />
     <PackageReference Include="Guard.Net" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
diff --git a/src/Arcus.Security.Tests.Integration/Arcus.Security.Tests.Integration.csproj b/src/Arcus.Security.Tests.Integration/Arcus.Security.Tests.Integration.csproj
index f5486c2f..f2b97b96 100644
--- a/src/Arcus.Security.Tests.Integration/Arcus.Security.Tests.Integration.csproj
+++ b/src/Arcus.Security.Tests.Integration/Arcus.Security.Tests.Integration.csproj
@@ -8,7 +8,7 @@
   
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.4.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
     <PackageReference Include="Vault" Version="0.9.1.3" />
diff --git a/src/Arcus.Security.Tests.Integration/IntegrationTest.cs b/src/Arcus.Security.Tests.Integration/IntegrationTest.cs
index 22202c39..1adf35a8 100644
--- a/src/Arcus.Security.Tests.Integration/IntegrationTest.cs
+++ b/src/Arcus.Security.Tests.Integration/IntegrationTest.cs
@@ -27,7 +27,7 @@ public IntegrationTest(ITestOutputHelper testOutput)
             var configuration = new LoggerConfiguration()
                 .WriteTo.XunitTestLogging(testOutput)
                 .WriteTo.Sink(InMemoryLogSink)
-                .WriteTo.AzureApplicationInsights(Configuration.GetValue<string>("Arcus:ApplicationInsights:InstrumentationKey"));
+                .WriteTo.AzureApplicationInsightsWithInstrumentationKey(Configuration.GetValue<string>("Arcus:ApplicationInsights:InstrumentationKey"));
 
             Logger = configuration.CreateLogger();
         }