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 @@ true - - - NU5104 - - @@ -30,7 +25,7 @@ - + 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 @@ - + 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("Arcus:ApplicationInsights:InstrumentationKey")); + .WriteTo.AzureApplicationInsightsWithInstrumentationKey(Configuration.GetValue("Arcus:ApplicationInsights:InstrumentationKey")); Logger = configuration.CreateLogger(); }