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

Jump to bottom

[main] Update dependencies from dotnet/arcade #80234

Merged
merged 26 commits into from
Jan 12, 2023
Merged

[main] Update dependencies from dotnet/arcade #80234

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c4cec2b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 5, 2023
39eb9af
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 6, 2023
a90f854
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 6, 2023
cbfc870
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 8, 2023
557b0aa
React to SDK change around linking
ViktorHofer Jan 9, 2023
52f4937
Update NetCoreAppToolCurrent to net8.0
ViktorHofer Jan 9, 2023
9b623ae
Upgrade aspnetcoretoolcurrent as well
ViktorHofer Jan 9, 2023
af2698d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 9, 2023
10039ab
[wasm] WasmAppHost: fix new analyzer warning
radical Jan 9, 2023
08e6984
Merge remote-tracking branch 'origin/main' into darc-main-aab430d2-d9…
radical Jan 9, 2023
8342ded
Fix CA1512 analyzer warnings
radical Jan 9, 2023
11b736e
fix
radical Jan 9, 2023
1fea7d7
React to aspnetcore analyzers
ViktorHofer Jan 10, 2023
616dc0c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 10, 2023
a65c046
Update tfm in WasmApp.LocalBuild.props
radical Jan 10, 2023
7295f8b
[wasm] Use dotnet version from global.json for helix
radical Jan 10, 2023
52b000b
Fix illink tests and react to analyzer
ViktorHofer Jan 11, 2023
978266d
Update hardcoded linker tfm
ViktorHofer Jan 11, 2023
003edf1
Fix illink tests
vitek-karas Jan 11, 2023
62d241c
Fix ILLinker tests on NativeAOT
ViktorHofer Jan 11, 2023
43b4d2c
Resolve analyzer warning in MonoLinkerTestsCasesExpectations
ViktorHofer Jan 11, 2023
38f62f6
Upgrade xunit runner tfm
ViktorHofer Jan 11, 2023
9dc60a2
Delete dead property
ViktorHofer Jan 11, 2023
ec5f16b
In NativeAOT common files with ILLink have ILLink format, meaning tab…
Jan 11, 2023
562cac4
Upgrade SDK because of "Failed to create CoreCLR"
ViktorHofer Jan 11, 2023
dbc28a7
Update macOS version target triple
ViktorHofer Jan 12, 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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>

<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<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>
Expand Down
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23053.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23053.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23054.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -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.23058.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fe7be991697bae1101c72947fa0a5eaad4a6250</Sha>
<Sha>53026f034f7b8abfb9362ed018519423d81c9abb</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>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.23058.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23058.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23058.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23058.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23058.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23058.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23058.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23058.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23058.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23058.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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: []
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 3 additions & 1 deletion eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions eng/illink.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100-alpha.1.23055.1",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.100"
"dotnet": "8.0.100-alpha.1.23055.1"
},
"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.23058.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23058.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23058.1",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22631.1"
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/mono/msbuild/apple/build/AppleApp.LocalBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<PropertyGroup>
<_NetCoreAppCurrent>net8.0</_NetCoreAppCurrent>
<_NetCoreAppToolCurrent>net7.0</_NetCoreAppToolCurrent>
<_NetCoreAppToolCurrent>net8.0</_NetCoreAppToolCurrent>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>

Expand Down
6 changes: 2 additions & 4 deletions src/mono/wasm/host/Options.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
if (c.Option.OptionValueType == OptionValueType.Required &&
index >= values.Count)
throw new OptionException(string.Format(
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/mono/wasm/host/WebServerStartup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -91,8 +92,8 @@ public void Configure(IApplicationBuilder app,
{
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();
});
}
Expand Down