microsoft
/
Omex
зеркало из https://github.com/microsoft/Omex.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

* Automatic NuGet package update 24416230

* Roll back Net8 updates for now

* Apply suggestions from code review

* Update target and SDK version

* update gh workflow build

* update gh codeql workflow build

* Add temporary SDK install to yml builds

* re-add net8 updates

* update devcontainer to install latest .NET SDK

* fix static analysis build error

* fix static analysis error

---------

Co-authored-by: Create Pull Request Task <Create Pull Request Task>
Co-authored-by: Keith Cully <2370032+K-Cully@users.noreply.github.com>
This commit is contained in:
Omex GitHub Bot 2023-11-28 14:24:06 +00:00 коммит произвёл GitHub
Родитель f4bcaf3504
Коммит 6589a53a12
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 41 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
.devcontainer/devcontainer.json
Просмотреть файл

@ -18,5 +18,8 @@
} }
}, },
"remoteUser": "vscode" "remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/dotnet:2": {}
}
} }

4
.github/pipelines/dotnet-initialize.yml поставляемый
Просмотреть файл

@ -10,6 +10,10 @@ parameters:
steps: steps:
- task: NuGetAuthenticate@1 - task: NuGetAuthenticate@1
displayName: NuGet Authenticate displayName: NuGet Authenticate
- task: UseDotNet@2
displayName: Temporarily install .NET 7 SDK while dual targeting
inputs:
version: "7.0.404"
- task: UseDotNet@2 - task: UseDotNet@2
displayName: Use .NET SDK from global.json displayName: Use .NET SDK from global.json
inputs: inputs:

6
.github/pipelines/github-semmle.yml поставляемый
Просмотреть файл

@ -36,7 +36,11 @@ extends:
- checkout: self - checkout: self
clean: true clean: true
- task: UseDotNet@2 - 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: inputs:
useGlobalJson: true useGlobalJson: true
- task: securedevelopmentteam.vss-secure-development-tools.build-task-semmle.Semmle@1 - task: securedevelopmentteam.vss-secure-development-tools.build-task-semmle.Semmle@1

2
.github/workflows/build.yml поставляемый
Просмотреть файл

@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-dotnet@v3 - uses: actions/setup-dotnet@v3
with: with:
dotnet-version: '7.0.x' dotnet-version: '8.0.x'
# Install SF SDK # Install SF SDK
- name: Install SF - name: Install SF
shell: pwsh shell: pwsh

2
.github/workflows/codeql-analysis.yml поставляемый
Просмотреть файл

@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- uses: actions/setup-dotnet@v3 - uses: actions/setup-dotnet@v3
with: with:
dotnet-version: '7.0.x' dotnet-version: '8.0.x'
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

2
Directory.Build.props
Просмотреть файл

@ -4,7 +4,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Target Platforms" > <PropertyGroup Label="Target Platforms" >
<NetCoreVersions>net7.0</NetCoreVersions> <NetCoreVersions>net7.0;net8.0</NetCoreVersions>
<NetStandardVersions>netstandard2.0</NetStandardVersions> <NetStandardVersions>netstandard2.0</NetStandardVersions>
<LibraryTargetFrameworks>$(NetCoreVersions);$(NetStandardVersions)</LibraryTargetFrameworks> <LibraryTargetFrameworks>$(NetCoreVersions);$(NetStandardVersions)</LibraryTargetFrameworks>
<ExecutableTargetFrameworks>$(NetCoreVersions)</ExecutableTargetFrameworks> <ExecutableTargetFrameworks>$(NetCoreVersions)</ExecutableTargetFrameworks>

42
Directory.Packages.props
Просмотреть файл

@ -7,30 +7,30 @@
<ItemGroup Label="Package Versions. AutoUpdate"> <ItemGroup Label="Package Versions. AutoUpdate">
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" /> <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" /> <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" /> <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" /> <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="4.7.0" /> <PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="4.8.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" /> <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.14" /> <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" /> <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" /> <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.14" /> <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" /> <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Net.Test.Sdk" Version="17.8.0" /> <PackageVersion Include="Microsoft.Net.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" /> <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" /> <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" /> <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="7.0.4" /> <PackageVersion Include="System.Text.Json" Version="8.0.0" />
<PackageVersion Include="System.Threading.Tasks" Version="4.3.0" /> <PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup> </ItemGroup>

2
global.json
Просмотреть файл

@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "7.0.404", "version": "8.0.100",
"rollForward": "latestMajor" "rollForward": "latestMajor"
} }
} }

4
src/Hosting.Services.Web/Middlewares/ResponseHeadersMiddleware.cs
Просмотреть файл

@ -23,8 +23,8 @@ namespace Microsoft.Omex.Extensions.Hosting.Services.Web.Middlewares
private Task SetResponseHeaders(object state) private Task SetResponseHeaders(object state)
{ {
HttpResponse response = (HttpResponse)state; HttpResponse response = (HttpResponse)state;
response.Headers.Add("X-Machine", m_context.MachineId); response.Headers.Append("X-Machine", m_context.MachineId);
response.Headers.Add("X-BuildVersion", m_context.BuildVersion); //Renamed from X-OfficeVersion response.Headers.Append("X-BuildVersion", m_context.BuildVersion); //Renamed from X-OfficeVersion
return Task.CompletedTask; return Task.CompletedTask;
} }

2
tests/Hosting.Services.Web.UnitTests/Middlewares/ObsoleteCorrelationHeadersMiddlewareTests.cs
Просмотреть файл

@ -36,7 +36,7 @@ namespace Microsoft.Omex.Extensions.Hosting.Services.Web.UnitTests
{ {
// Arrange // Arrange
Guid obsoleteCorrelation = Guid.NewGuid(); Guid obsoleteCorrelation = Guid.NewGuid();
TestHttpContext.Request.Headers.Add(correlationName, obsoleteCorrelation.ToString()); TestHttpContext.Request.Headers.Append(correlationName, obsoleteCorrelation.ToString());
// Act // Act
await TestMiddleware.InvokeAsync(TestHttpContext, DummyDelegate); await TestMiddleware.InvokeAsync(TestHttpContext, DummyDelegate);