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

.NET8 update - Automatic NuGet package update 24416230 AB#8430180 #640

Merged
merged 11 commits into from
Nov 28, 2023
Merged

.NET8 update - Automatic NuGet package update 24416230 AB#8430180 #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7259d5c
Automatic NuGet package update 24416230
Nov 22, 2023
ff636a0
Roll back Net8 updates for now
K-Cully Nov 22, 2023
92dcbed
Apply suggestions from code review
K-Cully Nov 22, 2023
069d4a4
Update target and SDK version
K-Cully Nov 28, 2023
15866c2
update gh workflow build
K-Cully Nov 28, 2023
88bd858
update gh codeql workflow build
K-Cully Nov 28, 2023
d946fa6
Add temporary SDK install to yml builds
K-Cully Nov 28, 2023
1bcaa03
re-add net8 updates
K-Cully Nov 28, 2023
422c3a6
update devcontainer to install latest .NET SDK
K-Cully Nov 28, 2023
f02b2d7
fix static analysis build error
K-Cully Nov 28, 2023
ba06d26
fix static analysis error
K-Cully Nov 28, 2023
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
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@
}
},

"remoteUser": "vscode"
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/dotnet:2": {}
}
}
4 changes: 4 additions & 0 deletions .github/pipelines/dotnet-initialize.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ parameters:
steps:
- task: NuGetAuthenticate@1
displayName: NuGet Authenticate
- task: UseDotNet@2
displayName: Temporarily install .NET 7 SDK while dual targeting
inputs:
version: "7.0.404"
- task: UseDotNet@2
displayName: Use .NET SDK from global.json
inputs:
Expand Down
6 changes: 5 additions & 1 deletion .github/pipelines/github-semmle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ extends:
- checkout: self
clean: true
- task: UseDotNet@2
displayName: Use .NET Core
displayName: Temporarily install .NET 7 SDK while dual targeting
inputs:
version: "7.0.404"
- task: UseDotNet@2
displayName: Use .NET SDK from global.json
inputs:
useGlobalJson: true
- task: securedevelopmentteam.vss-secure-development-tools.build-task-semmle.Semmle@1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
# Install SF SDK
- name: Install SF
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<PropertyGroup Label="Target Platforms" >
<NetCoreVersions>net7.0</NetCoreVersions>
<NetCoreVersions>net7.0;net8.0</NetCoreVersions>
<NetStandardVersions>netstandard2.0</NetStandardVersions>
<LibraryTargetFrameworks>$(NetCoreVersions);$(NetStandardVersions)</LibraryTargetFrameworks>
<ExecutableTargetFrameworks>$(NetCoreVersions)</ExecutableTargetFrameworks>
Expand Down
42 changes: 21 additions & 21 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
<ItemGroup Label="Package Versions. AutoUpdate">
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.14" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.14" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="4.8.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
K-Cully marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="Microsoft.Net.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
<PackageVersion Include="System.Text.Json" Version="7.0.4" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
K-Cully marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.404",
"version": "8.0.100",
"rollForward": "latestMajor"
}
}
4 changes: 2 additions & 2 deletions src/Hosting.Services.Web/Middlewares/ResponseHeadersMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Task IMiddleware.InvokeAsync(HttpContext context, RequestDelegate next)
private Task SetResponseHeaders(object state)
{
HttpResponse response = (HttpResponse)state;
response.Headers.Add("X-Machine", m_context.MachineId);
response.Headers.Add("X-BuildVersion", m_context.BuildVersion); //Renamed from X-OfficeVersion
response.Headers.Append("X-Machine", m_context.MachineId);
response.Headers.Append("X-BuildVersion", m_context.BuildVersion); //Renamed from X-OfficeVersion
return Task.CompletedTask;
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/Hosting.Services.Web.UnitTests/Middlewares/ObsoleteCorrelationHeadersMiddlewareTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task SetsObsoleteCorrelationIdFromHeaderToActivity(string correlati
{
// Arrange
Guid obsoleteCorrelation = Guid.NewGuid();
TestHttpContext.Request.Headers.Add(correlationName, obsoleteCorrelation.ToString());
TestHttpContext.Request.Headers.Append(correlationName, obsoleteCorrelation.ToString());

// Act
await TestMiddleware.InvokeAsync(TestHttpContext, DummyDelegate);
Expand Down