[main] Update dependencies from dotnet/arcade (#306)

[main] Update dependencies from dotnet/arcade


 - Remove .NET Standard workaround for xunit.

XUnit/2.6.6 doesn't bring .NET Standard 1.x in anymore.

Style nits...
This commit is contained in:
dotnet-maestro[bot] 2024-01-17 20:54:54 +00:00 коммит произвёл GitHub
Родитель 79f6f8b59c
Коммит 2902dcf064
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
12 изменённых файлов: 27 добавлений и 22 удалений

Просмотреть файл

@ -1,5 +0,0 @@
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
</PropertyGroup>
</Project>

Просмотреть файл

@ -8,14 +8,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24055.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24067.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
<Sha>cfa8c837c65bd29ed89366be29ff3ef06cea8a2e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24055.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24067.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
<Sha>cfa8c837c65bd29ed89366be29ff3ef06cea8a2e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

Просмотреть файл

@ -9,7 +9,6 @@
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
<!-- Pinned -->
<MicrosoftDiaSymReaderNativeVersion>17.0.0-beta1.21524.1</MicrosoftDiaSymReaderNativeVersion>
<NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
</PropertyGroup>
</Project>

Просмотреть файл

@ -182,12 +182,12 @@ while :; do
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
__QEMUArch=riscv64
__UbuntuArch=riscv64
__UbuntuRepo="http://deb.debian.org/debian-ports"
__UbuntuRepo="http://deb.debian.org/debian"
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
fi
;;
ppc64le)

Просмотреть файл

@ -1 +1 @@
deb http://deb.debian.org/debian-ports sid main
deb http://deb.debian.org/debian sid main

Просмотреть файл

@ -63,6 +63,10 @@ jobs:
steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- checkout: self
fetchDepth: 3
clean: true
- task: DownloadBuildArtifacts@0
displayName: Download artifact
inputs:

Просмотреть файл

@ -18,7 +18,7 @@ variables:
- name: SymbolToolVersion
value: 1.0.1
- name: BinlogToolVersion
value: 1.0.9
value: 1.0.11
- name: runCodesignValidationInjection
value: false

Просмотреть файл

@ -3,7 +3,7 @@ parameters:
JobLabel: ''
CustomSensitiveDataList: ''
# A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
BinlogToolVersion: '1.0.9'
BinlogToolVersion: '1.0.11'
steps:
- task: Powershell@2

Просмотреть файл

@ -596,7 +596,15 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
# Use override if it exists - commonly set by source-build
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
$initializeBuildToolFramework="net9.0"
} else {
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
}
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

Просмотреть файл

@ -3,6 +3,6 @@
"dotnet": "9.0.100-alpha.1.23615.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24055.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24067.2"
}
}

Просмотреть файл

@ -1,4 +1,5 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<PropertyGroup>
@ -9,4 +10,5 @@
<!-- Any code that allows overflows intentionally should be explicitly in an unchecked region. -->
<CheckForOverflowUnderflow Condition="'$(Configuration)' == 'Debug'">true</CheckForOverflowUnderflow>
</PropertyGroup>
</Project>

Просмотреть файл

@ -1,8 +1,5 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<ItemGroup Condition="'$(IsTestProject)' == 'true' or '$(MSBuildProjectName)' == 'TestUtilities'">
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'" />
</ItemGroup>
</Project>