未验证 提交 a40d411e 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

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

* Update dependencies from https://github.com/dotnet/arcade build 20230104.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23054.2

* Update dependencies from https://github.com/dotnet/arcade build 20230105.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23055.2

* Update dependencies from https://github.com/dotnet/arcade build 20230105.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23055.3

* Update dependencies from https://github.com/dotnet/arcade build 20230106.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23056.4

* React to SDK change around linking

* Update NetCoreAppToolCurrent to net8.0

* Upgrade aspnetcoretoolcurrent as well

* Update dependencies from https://github.com/dotnet/arcade build 20230108.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23058.1

* [wasm] WasmAppHost: fix new analyzer warning

`/__w/1/s/src/mono/wasm/host/WebServerStartup.cs(94,17): error ASP0019: Use IHeaderDictionary.Append or the indexer to append or set headers. IDictionary.Add will throw an ArgumentException when attempting to add a duplicate key. [/__w/1/s/src/mono/wasm/host/WasmAppHost.csproj]
`

* Fix CA1512 analyzer warnings

* fix

* React to aspnetcore analyzers

* Update dependencies from https://github.com/dotnet/arcade build 20230109.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23059.1

* Update tfm in WasmApp.LocalBuild.props

* [wasm] Use dotnet version from global.json for helix

* Fix illink tests and react to analyzer

* Update hardcoded linker tfm

* Fix illink tests

The analyzer tests download a ref package, but its version must at least roughly match the version used to run the tests.
Since this updates the SDK to 8.0, update the tests to pick some 8.0 ref package.

Also the new compiler produces two new warnings in one case, so baselined those in the test.

* Fix ILLinker tests on NativeAOT

* Resolve analyzer warning in MonoLinkerTestsCasesExpectations

* Upgrade xunit runner tfm

* Delete dead property

* In NativeAOT common files with ILLink have ILLink format, meaning tabs instead of spaces

* Upgrade SDK because of "Failed to create CoreCLR"

"Failed to create CoreCLR, HRESULT: 0x80131524" during runtime test ILC invocation. Might be fixed with https://github.com/dotnet/runtime/commit/6c0c96ccc775cad4119e2d5d3a1797c4126b4533

* Update macOS version target triple
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NViktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: NAnkit Jain <radical@gmail.com>
Co-authored-by: Nvitek-karas <10670590+vitek-karas@users.noreply.github.com>
Co-authored-by: NTlakollo <tlcejava@microsoft.com>
上级 25e84d3e
......@@ -71,11 +71,13 @@
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
in src/mono/wasm/build/WasmApp.LocalBuild.props in sync -->
<NetCoreAppToolCurrentVersion>8.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
<AspNetCoreAppCurrentVersion>7.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrentVersion>8.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
......
......@@ -94,73 +94,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23053.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
......@@ -286,9 +286,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>c1362c3067c08e04319df8ddfbf8ff551ca75a77</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23059.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>d360f5e4d22cdc673601d6cc60284ced948706ae</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22511.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
......
......@@ -81,21 +81,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22571.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23053.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23053.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23053.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23053.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23053.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23053.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23053.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23053.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23053.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23059.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23059.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23059.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23059.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23059.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23059.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23059.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23059.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23059.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
......
parameters:
runAsPublic: false
sourceIndexPackageVersion: 1.0.1-20220804.1
sourceIndexPackageVersion: 1.0.1-20221220.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
......@@ -40,10 +40,10 @@ jobs:
- ${{ preStep }}
- task: UseDotNet@2
displayName: Use .NET Core sdk 3.1
displayName: Use .NET Core SDK 6
inputs:
packageType: sdk
version: 3.1.x
version: 6.0.x
installationPath: $(Agent.TempDirectory)/dotnet
workingDirectory: $(Agent.TempDirectory)
......
......@@ -581,7 +581,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
......@@ -743,6 +743,8 @@ function MSBuild() {
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
......
......@@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="net7.0"
_InitializeBuildToolFramework="net8.0"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
......@@ -428,6 +428,8 @@ function MSBuild {
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
......
......@@ -2,6 +2,8 @@
<PropertyGroup>
<IsTrimmable Condition="'$(IsTrimmable)' == ''">true</IsTrimmable>
<!-- Don't use SDK's trimming functionality. -->
<_IsTrimmingEnabled>false</_IsTrimmingEnabled>
<PrepareResourcesDependsOn>_EmbedILLinkXmls;$(PrepareResourcesDependsOn)</PrepareResourcesDependsOn>
<TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true'">$(TargetsTriggeredByCompilation);ILLinkTrimAssembly</TargetsTriggeredByCompilation>
......
......@@ -13,6 +13,7 @@
Condition="'$(TargetArchitecture)' == 'wasm' And '$(TargetOS)' == 'browser'" />
<PropertyGroup Condition="'$(PublishAot)' == 'true'">
<AotRuntimePackageLoadedViaSDK>true</AotRuntimePackageLoadedViaSDK>
<ILCompilerTargetsPath>$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>
</PropertyGroup>
......
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100-alpha.1.23061.8",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.100"
"dotnet": "8.0.100-alpha.1.23061.8"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23053.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23053.5",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23053.5",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23059.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23059.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23059.1",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.23058.2"
......
......@@ -15,8 +15,7 @@ public KeptInitializerData ()
public KeptInitializerData (int occurrenceIndexInBody)
{
if (occurrenceIndexInBody < 0)
throw new ArgumentOutOfRangeException (nameof (occurrenceIndexInBody));
ArgumentOutOfRangeException.ThrowIfNegative(occurrenceIndexInBody);
}
}
}
......@@ -10,7 +10,7 @@ namespace Mono.Linker.Tests.TestCasesRunner
public static class PathUtilities
{
#if NET8_0
public const string TFMDirectoryName = "net8.0";
public const string TFMDirectoryName = "net8.0";
#elif NET7_0
public const string TFMDirectoryName = "net7.0";
#elif NET6_0
......
......@@ -290,6 +290,6 @@
</PropertyGroup>
<PropertyGroup>
<WorkloadTasksAssemblyPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)'))WorkloadBuildTasks.dll</WorkloadTasksAssemblyPath>
<WorkloadTasksAssemblyPath>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'WorkloadBuildTasks.dll'))</WorkloadTasksAssemblyPath>
</PropertyGroup>
</Project>
......@@ -13,8 +13,8 @@ public static async Task InvokeAsync(HttpContext context)
{
string responseBody = "Sending DEFLATE compressed";
context.Response.Headers.Add("Content-MD5", Convert.ToBase64String(ContentHelper.ComputeMD5Hash(responseBody)));
context.Response.Headers.Add("Content-Encoding", "deflate");
context.Response.Headers["Content-MD5"] = Convert.ToBase64String(ContentHelper.ComputeMD5Hash(responseBody));
context.Response.Headers["Content-Encoding"] = "deflate";
context.Response.ContentType = "text/plain";
......
......@@ -21,7 +21,7 @@ public static async Task InvokeAsync(HttpContext context)
}
// Add original request method verb as a custom response header.
context.Response.Headers.Add("X-HttpRequest-Method", context.Request.Method);
context.Response.Headers["X-HttpRequest-Method"] = context.Request.Method;
// Echo back JSON encoded payload.
RequestInformation info = await RequestInformation.CreateAsync(context.Request);
......@@ -34,7 +34,7 @@ public static async Task InvokeAsync(HttpContext context)
byte[] hash = md5.ComputeHash(bytes);
string encodedHash = Convert.ToBase64String(hash);
context.Response.Headers.Add("Content-MD5", encodedHash);
context.Response.Headers["Content-MD5"] = encodedHash;
context.Response.ContentType = "application/json";
context.Response.ContentLength = bytes.Length;
await context.Response.Body.WriteAsync(bytes, 0, bytes.Length);
......
......@@ -13,8 +13,8 @@ public static async Task InvokeAsync(HttpContext context)
{
string responseBody = "Sending GZIP compressed";
context.Response.Headers.Add("Content-MD5", Convert.ToBase64String(ContentHelper.ComputeMD5Hash(responseBody)));
context.Response.Headers.Add("Content-Encoding", "gzip");
context.Response.Headers["Content-MD5"] = Convert.ToBase64String(ContentHelper.ComputeMD5Hash(responseBody));
context.Response.Headers["Content-Encoding"] = "gzip";
context.Response.ContentType = "text/plain";
......
......@@ -21,7 +21,7 @@ public static async Task InvokeAsync(HttpContext context)
}
// Add original request method verb as a custom response header.
context.Response.Headers.Add("X-HttpRequest-Method", context.Request.Method);
context.Response.Headers["X-HttpRequest-Method"] = context.Request.Method;
var size = 1024;
if (context.Request.Query.TryGetValue("size", out var value))
......
......@@ -60,15 +60,13 @@ public static void Invoke(HttpContext context)
if (hops <= 1)
{
context.Response.Headers.Add("Location", redirectUri);
context.Response.Headers["Location"] = redirectUri;
}
else
{
context.Response.Headers.Add(
"Location",
string.Format("/Redirect.ashx?uri={0}&hops={1}",
context.Response.Headers["Location"] = string.Format("/Redirect.ashx?uri={0}&hops={1}",
redirectUri,
hops - 1));
hops - 1);
}
context.Response.StatusCode = statusCode;
......
......@@ -28,7 +28,7 @@ public static async Task InvokeAsync(HttpContext context)
byte[] bytes = Encoding.ASCII.GetBytes(echoJson);
var hash = md5.ComputeHash(bytes);
string encodedHash = Convert.ToBase64String(hash);
context.Response.Headers.Add("Content-MD5", encodedHash);
context.Response.Headers["Content-MD5"] = encodedHash;
RequestInformation newEcho = RequestInformation.DeSerializeFromJson(echoJson);
context.Response.ContentType = "text/plain"; //"application/json";
......
......@@ -14,19 +14,19 @@ public class VerifyUploadHandler
public static async Task InvokeAsync(HttpContext context)
{
// Report back original request method verb.
context.Response.Headers.Add("X-HttpRequest-Method", context.Request.Method);
context.Response.Headers["X-HttpRequest-Method"] = context.Request.Method;
// Report back original entity-body related request headers.
string contentLength = context.Request.Headers["Content-Length"];
if (!string.IsNullOrEmpty(contentLength))
{
context.Response.Headers.Add("X-HttpRequest-Headers-ContentLength", contentLength);
context.Response.Headers["X-HttpRequest-Headers-ContentLength"] = contentLength;
}
string transferEncoding = context.Request.Headers["Transfer-Encoding"];
if (!string.IsNullOrEmpty(transferEncoding))
{
context.Response.Headers.Add("X-HttpRequest-Headers-TransferEncoding", transferEncoding);
context.Response.Headers["X-HttpRequest-Headers-TransferEncoding"] = transferEncoding;
}
// Get request body.
......
......@@ -49,7 +49,7 @@ private static bool HandleBasicAuthentication(HttpContext context, string user,
if (authHeader == null)
{
context.Response.StatusCode = 401;
context.Response.Headers.Add("WWW-Authenticate", WwwAuthenticateHeaderValue);
context.Response.Headers["WWW-Authenticate"] = WwwAuthenticateHeaderValue;
return false;
}
......@@ -82,7 +82,7 @@ private static bool HandleBasicAuthentication(HttpContext context, string user,
if (pair.Length != 2 || pair[0] != user || pair[1] != password)
{
context.Response.StatusCode = 401;
context.Response.Headers.Add("WWW-Authenticate", WwwAuthenticateHeaderValue);
context.Response.Headers["WWW-Authenticate"] = WwwAuthenticateHeaderValue;
return false;
}
......@@ -100,7 +100,7 @@ private static bool HandleBasicAuthentication(HttpContext context, string user,
if (authHeader == null)
{
context.Response.StatusCode = 401;
context.Response.Headers.Add("WWW-Authenticate", authType);
context.Response.Headers["WWW-Authenticate"] = authType;
return false;
}
......
......@@ -18,7 +18,7 @@ public static void AddResponseCookies(HttpContext context)
{
if (string.Equals(pair.Key, "X-SetCookie", StringComparison.OrdinalIgnoreCase))
{
context.Response.Headers.Add("Set-Cookie", pair.Value.ToString());
context.Response.Headers["Set-Cookie"] = pair.Value.ToString();
}
}
}
......
......@@ -95,7 +95,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'osx'">
<TargetTriple Condition="'$(TargetArchitecture)' == 'arm64'">arm64-apple-macos11</TargetTriple>
<TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.14</TargetTriple>
<TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.15</TargetTriple>
<XCodeSdkName>macosx</XCodeSdkName>
</PropertyGroup>
......
......@@ -53,6 +53,8 @@
<IncludeXHarnessCli>true</IncludeXHarnessCli>
<EnableXHarnessTelemetry>false</EnableXHarnessTelemetry>
<IncludeNodePayload Condition="'$(NeedsEMSDKNode)' == 'true' and '$(NeedsEMSDK)' != 'true'">true</IncludeNodePayload>
<UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson>
</PropertyGroup>
<Import Project="$(TestArchiveRoot)**\*.helix.targets" />
......@@ -137,7 +139,7 @@
<When Condition="'$(NeedsEMSDK)' == 'true'">
<PropertyGroup>
<NeedsDotNetSdk>true</NeedsDotNetSdk>
<!-- <UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson> -->
<UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson>
<IncludeXHarnessCli>true</IncludeXHarnessCli>
<EnableXHarnessTelemetry>false</EnableXHarnessTelemetry>
</PropertyGroup>
......
......@@ -23,7 +23,7 @@
<PropertyGroup>
<_NetCoreAppCurrent>net8.0</_NetCoreAppCurrent>
<_NetCoreAppToolCurrent>net7.0</_NetCoreAppToolCurrent>
<_NetCoreAppToolCurrent>net8.0</_NetCoreAppToolCurrent>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>
......
......@@ -22,7 +22,7 @@
<Import Project="$(MSBuildThisFileDirectory)WasmApp.props" />
<PropertyGroup>
<_TargetFrameworkForNETCoreTasks>net7.0</_TargetFrameworkForNETCoreTasks>
<_TargetFrameworkForNETCoreTasks>net8.0</_TargetFrameworkForNETCoreTasks>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>
......
......@@ -342,8 +342,7 @@ private void AssertValid(int index)
{
if (c.Option == null)
throw new InvalidOperationException("OptionContext.Option is null.");
if (index >= c.Option.MaxValueCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(index, c.Option.MaxValueCount, nameof(index));
if (c.Option.OptionValueType == OptionValueType.Required &&
index >= values.Count)
throw new OptionException(string.Format(
......@@ -453,8 +452,7 @@ protected Option(string prototype, string description, int maxValueCount)
protected Option(string prototype, string description, int maxValueCount, bool hidden)
{
ArgumentException.ThrowIfNullOrEmpty(prototype);
if (maxValueCount < 0)
throw new ArgumentOutOfRangeException(nameof(maxValueCount));
ArgumentOutOfRangeException.ThrowIfNegative(maxValueCount);
this.prototype = prototype;
this.description = description;
......
......@@ -13,6 +13,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Server.Features;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
......@@ -91,8 +92,8 @@ static int GetNextRandomExcept(Range range, params int[] except)
{
app.Use((context, next) =>
{
context.Response.Headers.Add("Cross-Origin-Embedder-Policy", "require-corp");
context.Response.Headers.Add("Cross-Origin-Opener-Policy", "same-origin");
context.Response.Headers.Append("Cross-Origin-Embedder-Policy", "require-corp");
context.Response.Headers.Append("Cross-Origin-Opener-Policy", "same-origin");
return next();
});
}
......
......@@ -14,7 +14,6 @@
<OutputPath>$(TargetingPackPath)</OutputPath>
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
<XUnitRunnerTargetFramework>net7.0</XUnitRunnerTargetFramework>
<CLRTestKind>SharedLibrary</CLRTestKind>
<IsTestProject>false</IsTestProject>
<GenerateDependencyFile>false</GenerateDependencyFile>
......
......@@ -164,7 +164,7 @@ static void ProcessGenericParameters (SyntaxNodeAnalysisContext context)
}
}
static IEnumerable<Diagnostic> GetDynamicallyAccessedMembersDiagnostics (SingleValue sourceValue, SingleValue targetValue, Location location)
static List<Diagnostic> GetDynamicallyAccessedMembersDiagnostics (SingleValue sourceValue, SingleValue targetValue, Location location)
{
// The target should always be an annotated value, but the visitor design currently prevents
// declaring this in the type system.
......
......@@ -262,7 +262,7 @@ public class ILLink : ToolTask
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
// The linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net7.0", "illink.dll");
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net8.0", "illink.dll");
return _illinkPath;
}
set => _illinkPath = value;
......
......@@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Older SDKs used this property as a sentinel instead, to control the import of this file
(but not the targets, which were included with the SDK). -->
<UsingILLinkTasksSdk>true</UsingILLinkTasksSdk>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net7.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net8.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly>
</PropertyGroup>
......
......@@ -287,6 +287,10 @@ public void M()
}
""";
return VerifyRequiresAssemblyFilesAnalyzer (src,
// (7,7): warning SYSLIB0044: 'AssemblyName.CodeBase' is obsolete: 'AssemblyName.CodeBase and AssemblyName.EscapedCodeBase are obsolete. Using them for loading an assembly is not supported.'
DiagnosticResult.CompilerWarning ("SYSLIB0044").WithSpan (7, 7, 7, 17).WithArguments ("System.Reflection.AssemblyName.CodeBase", "AssemblyName.CodeBase and AssemblyName.EscapedCodeBase are obsolete. Using them for loading an assembly is not supported."),
// (8,7): warning SYSLIB0044: 'AssemblyName.EscapedCodeBase' is obsolete: 'AssemblyName.CodeBase and AssemblyName.EscapedCodeBase are obsolete. Using them for loading an assembly is not supported.'
DiagnosticResult.CompilerWarning ("SYSLIB0044").WithSpan (8, 7, 8, 24).WithArguments ("System.Reflection.AssemblyName.EscapedCodeBase", "AssemblyName.CodeBase and AssemblyName.EscapedCodeBase are obsolete. Using them for loading an assembly is not supported."),
// (7,7): warning IL3002: Using member 'System.Reflection.AssemblyName.CodeBase.get' which has 'RequiresAssemblyFilesAttribute' can break functionality when embedded in a single-file app. The code will return an empty string for assemblies embedded in a single-file app.
VerifyCS.Diagnostic (DiagnosticId.RequiresAssemblyFiles).WithSpan (7, 7, 7, 17).WithArguments ("System.Reflection.AssemblyName.CodeBase.get", " The code will return an empty string for assemblies embedded in a single-file app.", ""),
// (7,7): warning IL3000: 'System.Reflection.AssemblyName.CodeBase' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'.
......
......@@ -26,9 +26,9 @@ public abstract class TestCaseUtils
public static readonly ReferenceAssemblies Net6PreviewAssemblies =
new ReferenceAssemblies (
"net7.0",
new PackageIdentity ("Microsoft.NETCore.App.Ref", "7.0.0-preview.5.22301.12"),
Path.Combine ("ref", "net7.0"))
"net8.0",
new PackageIdentity ("Microsoft.NETCore.App.Ref", "8.0.0-alpha.1.23060.19"),
Path.Combine ("ref", "net8.0"))
.WithNuGetConfigFilePath (Path.Combine (TestCaseUtils.GetRepoRoot (), "NuGet.config"));
private static ImmutableArray<MetadataReference> s_net6Refs;
......@@ -159,7 +159,7 @@ public static void GetDirectoryPaths (out string rootSourceDirectory, out string
var LinkerTestDirectory = (string)AppContext.GetData("ILLink.RoslynAnalyzer.Tests.LinkerTestDir")!;
var configuration = (string)AppContext.GetData("ILLink.RoslynAnalyzer.Tests.Configuration")!;
const string tfm = "net7.0";
const string tfm = "net8.0";
rootSourceDirectory = Path.GetFullPath(Path.Combine(LinkerTestDirectory, "Mono.Linker.Tests.Cases"));
testAssemblyPath = Path.GetFullPath(Path.Combine(artifactsBinDirectory, "ILLink.RoslynAnalyzer.Tests", configuration, tfm));
......
......@@ -15,7 +15,9 @@ public static class PathUtilities
public const string ConfigDirectoryName = "Release";
#endif
#if NET7_0
#if NET8_0
public const string TFMDirectoryName = "net8.0";
#elif NET7_0
public const string TFMDirectoryName = "net7.0";
#elif NET6_0
public const string TFMDirectoryName = "net6.0";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册