diff --git a/eng/Publishing.props b/eng/Publishing.props index 172a6c0b220e58..e268fb36e8de10 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -5,6 +5,11 @@ false + + + + + diff --git a/eng/Signing.props b/eng/Signing.props index 1b36027d8f8ac9..c3fd63545484ff 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -128,7 +128,7 @@ - + clr+mono+libs+host+packs clr.nativeaotruntime+clr.nativeaotlibs+mono+libs+host+packs clr.nativeaotruntime+clr.nativeaotlibs+libs+packs + clr+libs+tools+host+packs clr+libs+tools+host+packs mono+packs diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3804c0bab259d7..e38a67f5e89ad2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,45 +6,45 @@ This file should be imported by eng/Versions.props - 5.7.0-1.26203.108 - 5.7.0-1.26203.108 - 5.7.0-1.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 0.11.5-preview.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 11.0.0-beta.26203.108 - 3.2.2-beta.26203.108 - 2.9.3-beta.26203.108 - 11.0.0-beta.26203.108 - 5.7.0-1.26203.108 - 11.0.0-preview.4.26203.108 - 11.0.100-preview.4.26203.108 - 11.0.0-preview.4.26203.108 - 11.0.0-preview.4.26203.108 - 7.6.0-rc.20408 - 7.6.0-rc.20408 - 7.6.0-rc.20408 - 7.6.0-rc.20408 - 11.0.0-preview.4.26203.108 - 3.0.0-preview.4.26203.108 - 11.0.0-preview.4.26203.108 - 11.0.0-preview.4.26203.108 - 11.0.0-preview.4.26203.108 + 5.7.0-1.26210.111 + 5.7.0-1.26210.111 + 5.7.0-1.26210.111 + 11.0.100-preview.4.26210.111 + 11.0.100-preview.4.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 0.11.5-preview.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 11.0.0-beta.26210.111 + 3.2.2-beta.26210.111 + 2.9.3-beta.26210.111 + 11.0.0-beta.26210.111 + 5.7.0-1.26210.111 + 11.0.0-preview.4.26210.111 + 11.0.100-preview.4.26210.111 + 11.0.0-preview.4.26210.111 + 11.0.0-preview.4.26210.111 + 7.6.0-rc.21111 + 7.6.0-rc.21111 + 7.6.0-rc.21111 + 7.6.0-rc.21111 + 11.0.0-preview.4.26210.111 + 3.0.0-preview.4.26210.111 + 11.0.0-preview.4.26210.111 + 11.0.0-preview.4.26210.111 + 11.0.0-preview.4.26210.111 11.0.0-alpha.1.26181.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54a2950d99b4f..2898410c822116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project adb0185573ea50f6622e29860297b7a3213b1000 - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project adb0185573ea50f6622e29860297b7a3213b1000 - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness e5857fbbc3f1d39d2776af5a5e3235c9ff485afa - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,29 +323,29 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -357,21 +357,21 @@ - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc - + https://github.com/dotnet/dotnet - 1a405c76db678301b6f6f5b22d2a63a152c26b97 + 5bed4499b04cbbaec57ac4209ae993acca3648cc https://github.com/dotnet/node diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b64b66a6275bb5..4017ff15ebf4b4 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -22,7 +22,7 @@ $warnAsError = if ($noWarnAsError) { $false } else { $true } function Print-Usage() { Write-Host "Common settings:" - Write-Host " -task Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)" + Write-Host " -task Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)" Write-Host " -restore Restore dependencies" Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" Write-Host " -help Print help and exit" diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 3270f83fa9a76a..1cf71bb2aea4ff 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -2,7 +2,7 @@ show_usage() { echo "Common settings:" - echo " --task Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)" + echo " --task Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)" echo " --restore Restore dependencies" echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" echo " --help Print help and exit" diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c96f5018fe43a8..6710ffb884bb23 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -545,7 +545,6 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - # keep this in sync with the VSWhereVersion in DefaultVersions.props $vswhereVersion = '3.1.7' } @@ -680,7 +679,17 @@ function GetNuGetPackageCachePath() { # Returns a full path to an Arcade SDK task project file. function GetSdkTaskProject([string]$taskName) { - return Join-Path (Split-Path (InitializeToolset) -Parent) "SdkTasks\$taskName.proj" + $toolsetDir = Split-Path (InitializeToolset) -Parent + $proj = Join-Path $toolsetDir "$taskName.proj" + if (Test-Path $proj) { + return $proj + } + # TODO: Remove this fallback once all supported versions use the new layout. + $legacyProj = Join-Path $toolsetDir "SdkTasks\$taskName.proj" + if (Test-Path $legacyProj) { + return $legacyProj + } + throw "Unable to find $taskName.proj in toolset at: $toolsetDir" } function InitializeNativeTools() { @@ -717,13 +726,18 @@ function InitializeToolset() { $nugetCache = GetNuGetPackageCachePath $toolsetVersion = Read-ArcadeSdkVersion - $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt" + $toolsetToolsDir = Join-Path $ToolsetDir $toolsetVersion - if (Test-Path $toolsetLocationFile) { - $path = Get-Content $toolsetLocationFile -TotalCount 1 - if (Test-Path $path) { - return $global:_InitializeToolset = $path - } + # Check if the toolset has already been extracted + $toolsetBuildProj = $null + $buildProjPath = Join-Path $toolsetToolsDir 'Build.proj' + + if (Test-Path $buildProjPath) { + $toolsetBuildProj = $buildProjPath + } + + if ($toolsetBuildProj -ne $null) { + return $global:_InitializeToolset = $toolsetBuildProj } if (-not $restore) { @@ -731,21 +745,40 @@ function InitializeToolset() { ExitWithExitCode 1 } - $buildTool = InitializeBuildTool + $downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--prerelease", "--output", "$nugetCache") + if ($env:NUGET_CONFIG) { + $downloadArgs += "--configfile" + $downloadArgs += $env:NUGET_CONFIG + } + DotNet @downloadArgs - $proj = Join-Path $ToolsetDir 'restore.proj' - $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'ToolsetRestore.binlog') } else { '' } + $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) + $packageToolsetDir = Join-Path $packageDir 'toolset' + $packageToolsDir = Join-Path $packageDir 'tools' - '' | Set-Content $proj + # TODO: Remove the tools/ check once all supported versions have the toolset folder. + if (!(Test-Path $packageToolsetDir) -and !(Test-Path $packageToolsDir)) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK package does not contain a toolset or tools folder: $packageDir" + ExitWithExitCode 3 + } - MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile + New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null - $path = Get-Content $toolsetLocationFile -Encoding UTF8 -TotalCount 1 - if (!(Test-Path $path)) { - throw "Invalid toolset path: $path" + # Copy toolset if present at the package root (new layout), otherwise fall back to tools + if (Test-Path $packageToolsetDir) { + Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force + } else { + # TODO: Remove this fallback once all supported versions have the toolset folder. + Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force } - return $global:_InitializeToolset = $path + if (Test-Path $buildProjPath) { + $toolsetBuildProj = $buildProjPath + } else { + throw "Unable to find Build.proj in toolset at: $toolsetToolsDir" + } + + return $global:_InitializeToolset = $toolsetBuildProj } function ExitWithExitCode([int] $exitCode) { @@ -806,6 +839,40 @@ function MSBuild() { MSBuild-Core @args } +# +# Executes a dotnet command with arguments passed to the function. +# Terminates the script if the command fails. +# +function DotNet() { + $dotnetRoot = InitializeDotNetCli -install:$restore + $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') + + $cmdArgs = "" + foreach ($arg in $args) { + if ($null -ne $arg -and $arg.Trim() -ne "") { + if ($arg.EndsWith('\')) { + $arg = $arg + "\" + } + $cmdArgs += " `"$arg`"" + } + } + + $env:ARCADE_BUILD_TOOL_COMMAND = "`"$dotnetPath`" $cmdArgs" + + $exitCode = Exec-Process $dotnetPath $cmdArgs + + if ($exitCode -ne 0) { + Write-Host "dotnet command failed with exit code $exitCode. Check errors above." -ForegroundColor Red + + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { + Write-PipelineSetResult -Result "Failed" -Message "dotnet command execution failed." + ExitWithExitCode 0 + } else { + ExitWithExitCode $exitCode + } + } +} + # # Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. # The arguments are automatically quoted. @@ -842,7 +909,7 @@ function MSBuild-Core() { $cmdArgs += ' /p:TreatWarningsAsErrors=false' } - if ($warnNotAsError) { + if ($warnAsError -and $warnNotAsError) { $cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$warnNotAsError" } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a6e0ed594fda17..d2339eb21d5945 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -407,15 +407,18 @@ function InitializeToolset { ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" local toolset_version=$_ReadGlobalVersion - local toolset_location_file="$toolset_dir/$toolset_version.txt" + local toolset_tools_dir="$toolset_dir/$toolset_version" - if [[ -a "$toolset_location_file" ]]; then - local path=`cat "$toolset_location_file"` - if [[ -a "$path" ]]; then - # return value - _InitializeToolset="$path" - return - fi + # Check if the toolset has already been extracted + local toolset_build_proj="" + if [[ -a "$toolset_tools_dir/Build.proj" ]]; then + toolset_build_proj="$toolset_tools_dir/Build.proj" + fi + + if [[ -n "$toolset_build_proj" ]]; then + # return value + _InitializeToolset="$toolset_build_proj" + return fi if [[ "$restore" != true ]]; then @@ -423,20 +426,34 @@ function InitializeToolset { ExitWithExitCode 2 fi - local proj="$toolset_dir/restore.proj" + local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--prerelease" "--output" "$_GetNuGetPackageCachePath") + if [[ -n "${NUGET_CONFIG:-}" ]]; then + download_args+=("--configfile" "$NUGET_CONFIG") + fi + DotNet "${download_args[@]}" + + local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" - local bl="" - if [[ "$binary_log" == true ]]; then - bl="/bl:$log_dir/ToolsetRestore.binlog" + # TODO: Remove the tools/ check once all supported versions have the toolset folder. + if [[ ! -d "$package_dir/toolset" && ! -d "$package_dir/tools" ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset or tools folder: $package_dir" + ExitWithExitCode 3 fi - echo '' > "$proj" - MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + mkdir -p "$toolset_tools_dir" - local toolset_build_proj=`cat "$toolset_location_file"` + # Copy toolset if present at the package root (new layout), otherwise fall back to tools + if [[ -d "$package_dir/toolset" ]]; then + cp -r "$package_dir/toolset/." "$toolset_tools_dir" + else + # TODO: Remove this fallback once all supported versions have the toolset folder. + cp -r "$package_dir/tools/." "$toolset_tools_dir" + fi - if [[ ! -a "$toolset_build_proj" ]]; then - Write-PipelineTelemetryError -category 'Build' "Invalid toolset path: $toolset_build_proj" + if [[ -a "$toolset_tools_dir/Build.proj" ]]; then + toolset_build_proj="$toolset_tools_dir/Build.proj" + else + Write-PipelineTelemetryError -category 'Build' "Unable to find Build.proj in toolset at: $toolset_tools_dir" ExitWithExitCode 3 fi @@ -458,6 +475,26 @@ function StopProcesses { return 0 } +function DotNet { + InitializeDotNetCli $restore + + local dotnet_path="$_InitializeDotNetCli/dotnet" + + export ARCADE_BUILD_TOOL_COMMAND="$dotnet_path $@" + + "$dotnet_path" "$@" || { + local exit_code=$? + echo "dotnet command failed with exit code $exit_code. Check errors above." + + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then + Write-PipelineSetResult -result "Failed" -message "dotnet command execution failed." + ExitWithExitCode 0 + else + ExitWithExitCode $exit_code + fi + } +} + function MSBuild { local args=( "$@" ) if [[ "$pipelines_log" == true ]]; then @@ -534,7 +571,7 @@ function MSBuild-Core { fi local warnnotaserror_switch="" - if [[ -n "$warn_not_as_error" ]]; then + if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" fi @@ -555,8 +592,22 @@ function GetDarc { # Returns a full path to an Arcade SDK task project file. function GetSdkTaskProject { - taskName=$1 - echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj" + local taskName=$1 + local toolsetDir + toolsetDir="$(dirname "$_InitializeToolset")" + local proj="$toolsetDir/$taskName.proj" + if [[ -a "$proj" ]]; then + echo "$proj" + return + fi + # TODO: Remove this fallback once all supported versions use the new layout. + local legacyProj="$toolsetDir/SdkTasks/$taskName.proj" + if [[ -a "$legacyProj" ]]; then + echo "$legacyProj" + return + fi + Write-PipelineTelemetryError -category 'Build' "Unable to find $taskName.proj in toolset at: $toolsetDir" + ExitWithExitCode 3 } ResolvePath "${BASH_SOURCE[0]}" diff --git a/global.json b/global.json index d7d94d293902a9..e9e902b89ade89 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "11.0.100-preview.3.26170.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26203.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26203.108", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26203.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26210.111", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26210.111", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26210.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.4.26203.108" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.4.26210.111" } } diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt b/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt index b5680e075f25bc..3b953f250ccc9e 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt @@ -1,4 +1,13 @@ Microsoft.CSharp|4.7.0 +Microsoft.Extensions.Caching.Abstractions|${ProductVersion} +Microsoft.Extensions.Configuration.Abstractions|${ProductVersion} +Microsoft.Extensions.DependencyInjection.Abstractions|${ProductVersion} +Microsoft.Extensions.Diagnostics.Abstractions|${ProductVersion} +Microsoft.Extensions.FileProviders.Abstractions|${ProductVersion} +Microsoft.Extensions.Hosting.Abstractions|${ProductVersion} +Microsoft.Extensions.Logging.Abstractions|${ProductVersion} +Microsoft.Extensions.Options|${ProductVersion} +Microsoft.Extensions.Primitives|${ProductVersion} Microsoft.VisualBasic|10.4.0 Microsoft.Win32.Primitives|4.3.0 Microsoft.Win32.Registry|5.0.0 diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index d3ee579507d087..35b2220340c5ce 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -26,4 +26,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 7f3247a5ffe163..b99e83ccf69f7a 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -21,4 +21,11 @@ Microsoft.Extensions.Caching.Memory.IMemoryCache + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index 4fb5bcb37c78c2..b10542a3137239 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index 081eefac7e2616..f9e5dfb910cfa4 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -8,7 +8,7 @@ true - + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj index c1642a7ecfe51b..a1aea5f01f4ee6 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj @@ -13,12 +13,12 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj index 0013b8d8e46ba0..9405d64e76f25f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -10,4 +10,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 07f11b713e8b0a..f1075ef4609d3e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -15,4 +15,10 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj index 3e1809ca374d36..409a60f69484d9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index 4580cca7a2ef12..d60e1edb55f2e5 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -33,11 +33,14 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj index ddc4d17d10f019..cb37de8d75c12f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj @@ -41,13 +41,16 @@ - - + + + + + PreserveNewest diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/UnitTests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/UnitTests/Microsoft.Extensions.Configuration.Binder.Tests.csproj index 422f8bf1163304..3b1f1ca1e33aa9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/UnitTests/Microsoft.Extensions.Configuration.Binder.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/UnitTests/Microsoft.Extensions.Configuration.Binder.Tests.csproj @@ -24,8 +24,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj index 7fa2dbb646be44..000edc79d176a4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index ef6b865ad3ac09..453593cdc99bce 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -13,6 +13,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj index 91d6b800969a08..c50143436bfaf4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj @@ -16,8 +16,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index d333cbe9508b8b..a8c425d4cc365d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index d1504808ce3b2f..c949a3ea28829d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj index a6d935e1e74029..287ebb5baccaa9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj @@ -17,6 +17,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj index b859f4db4e70cb..45c5694d6756d3 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -10,8 +10,11 @@ + + + + - diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index 7341a9a945aec0..e9ea5bc4f03089 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -9,9 +9,12 @@ + + + + - diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj index 32d6c1ccd47054..04c20d5d5ea904 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj @@ -9,8 +9,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index 66faa852a97541..cdcb27eb9b1311 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -9,8 +9,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj index 678d60c9a674a7..79dcc6d7903553 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj @@ -8,9 +8,12 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 1b1d2e7a165a4b..ffb6f0f9dbbefe 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -10,12 +10,12 @@ - - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj index 104f78b2bb602a..5477591879ce86 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -8,7 +8,10 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index 5c80805b82c88b..7b70628c7052cf 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -8,12 +8,15 @@ - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj index 1986c147adf7fc..5699f2e5b41584 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj @@ -15,8 +15,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 3d71436cac0f28..0e072cb37ac82a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -14,11 +14,14 @@ - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj index d02ca27342839d..7bd58cd0cd053a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj @@ -5,6 +5,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index ea25081d28cd79..cb2fe733e9cb41 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -8,12 +8,15 @@ - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj index 6e7e6ec9e90800..d23ce8155b6251 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj @@ -21,8 +21,6 @@ - - @@ -32,4 +30,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj index 245d86dec45e69..91ef2601d28568 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj @@ -15,8 +15,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index 1f7fb2267541d7..eb909f39258d38 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -20,4 +20,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index 98896da330bd82..95067b13cd7039 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -36,4 +36,15 @@ Microsoft.Extensions.DependencyInjection.IServiceCollection + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index ba683d4ad02606..b4e61ea14be2a4 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -18,9 +18,12 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj index c3eb01a5ae60c4..0e8e4565564957 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index cbf4e9cb82dcbc..4a98b59fbfe139 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -50,7 +50,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CollectibleAssembly/CollectibleAssembly.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CollectibleAssembly/CollectibleAssembly.csproj index 7eaa265d0a9340..9634a7dbdb3c78 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CollectibleAssembly/CollectibleAssembly.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CollectibleAssembly/CollectibleAssembly.csproj @@ -6,8 +6,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index 64fb6f86521bb5..e809e2dac714b1 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -13,7 +13,6 @@ - @@ -22,6 +21,10 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj index a601b683d86f9c..3ee8c943f6d5b9 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj @@ -4,6 +4,7 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) true true + $(NoWarn);NU1511 $(NoWarn);CS0436 diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj index 4e77d2e5b2e094..2028fc09150426 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj @@ -22,4 +22,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Microsoft.Extensions.Diagnostics.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Microsoft.Extensions.Diagnostics.Abstractions.csproj index 0254acdc4052e1..81150cdd9be540 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Microsoft.Extensions.Diagnostics.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Microsoft.Extensions.Diagnostics.Abstractions.csproj @@ -38,4 +38,11 @@ Microsoft.Extensions.Diagnostics.Metrics.MetricsOptions + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Resources/Strings.resx deleted file mode 100644 index d58980a38d7140..00000000000000 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Resources/Strings.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/tests/Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/tests/Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj index c59795b670cbef..451d3d04ff5b0b 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/tests/Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/tests/Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj @@ -6,8 +6,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/ref/Microsoft.Extensions.Diagnostics.csproj b/src/libraries/Microsoft.Extensions.Diagnostics/ref/Microsoft.Extensions.Diagnostics.csproj index 1299aac25941d9..dd9c59cfdb6f5d 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics/ref/Microsoft.Extensions.Diagnostics.csproj +++ b/src/libraries/Microsoft.Extensions.Diagnostics/ref/Microsoft.Extensions.Diagnostics.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/src/Microsoft.Extensions.Diagnostics.csproj b/src/libraries/Microsoft.Extensions.Diagnostics/src/Microsoft.Extensions.Diagnostics.csproj index 03b45a99a65f71..d56673fdeda709 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics/src/Microsoft.Extensions.Diagnostics.csproj +++ b/src/libraries/Microsoft.Extensions.Diagnostics/src/Microsoft.Extensions.Diagnostics.csproj @@ -15,8 +15,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj index 0443ed701e2c31..920188228df152 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -10,4 +10,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index e1c8b65df3d12b..6a6048c82f8dfa 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -21,4 +21,9 @@ Microsoft.Extensions.FileProviders.IFileProvider + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj index 1b850e300ab211..1b60f42d29dcfd 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index 2cb7c2d4b059a5..484716e3c29383 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -10,7 +10,7 @@ false - + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj index 62f8c046761841..7298bccf367791 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj @@ -12,8 +12,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj index e26604f100bb6f..c8ec2bb252b0c2 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj @@ -8,8 +8,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index ae7ebacc83bb92..955a07edf1f115 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -21,8 +21,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj index 0379f3b1629f53..7fdb88d94c1b40 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj index 05f82aaaa19252..ec761fd8bb353d 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -27,4 +27,15 @@ + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index f63fbd4667b62e..4bf4a4ff0fac48 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -31,4 +31,10 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/tests/Microsoft.Extensions.Hosting.Abstractions.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/tests/Microsoft.Extensions.Hosting.Abstractions.Tests.csproj index 886164bfcc8c4c..ca92d0164b5fbd 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/tests/Microsoft.Extensions.Hosting.Abstractions.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/tests/Microsoft.Extensions.Hosting.Abstractions.Tests.csproj @@ -6,8 +6,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj index a465d075a1ce04..ba16c6f04c7714 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -16,14 +16,17 @@ - + + + + + + + - - - diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index b5398e42c182f9..3538ba4b7397bd 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -23,7 +23,6 @@ - @@ -31,18 +30,22 @@ - - - - + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj index 5be2c58324408a..b7405f0d551295 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -14,9 +14,12 @@ + + + + - diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index d83147612a7081..8192e205ca4f84 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -27,9 +27,12 @@ System.Net.Http.IHttpClientFactory + + + + - diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj index d704d7564ab177..3f758820636e9c 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj @@ -28,13 +28,13 @@ - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj index 9d4c9f5ccf4715..19f520bbca8999 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -10,10 +10,11 @@ + - - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index bdab5d5560e137..acc645ed453fd9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -57,4 +57,14 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger PackAsAnalyzer="true" /> + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets index 7b684bbe7fc7f6..614167a2059a78 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets @@ -29,10 +29,13 @@ - + + + + PreserveNewest diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj index b73179d355ddeb..d752c2959d86c0 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -17,10 +17,13 @@ - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 14099251ab4b9a..3043c52bf1af54 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -25,17 +25,20 @@ - - - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index b3041036dc657b..e3f80484ef2583 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -19,14 +19,14 @@ - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index 9398b832595806..5999c85b907c42 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -49,14 +49,14 @@ OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" /> - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj index ae204ee82890c3..5f581c53b7906c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 37f81bd6917335..e04e038eea1b26 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -15,8 +15,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index 400910cffffb6b..85be6d766ed3e1 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 260b2787ade82e..d27797474ffb54 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -25,10 +25,13 @@ OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" /> - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index 4e432129540a4c..d219fc02d5614d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 7be872efbc3f44..f1161a38aeec5d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -24,8 +24,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj index d865a2007e465a..911e076b5905f7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index a5740c2c73f69f..08d10db154d556 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -8,8 +8,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj index a7d3bfaa6d8815..ceaaa49c6aac36 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index f8829a5a0a0cd4..2dc84ec82493ed 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -20,6 +20,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj index eb64f40c2a38ed..fbd4bfeda5a158 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj @@ -3,6 +3,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkCurrent) true + $(NoWarn);NU1511 diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index a5b7d1a8d81bc9..1bdc261dbcccc8 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -17,8 +17,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 15ceb28034fccd..16a42e33f5d080 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -17,8 +17,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj index b8e359047706c9..cbbf693872d4fa 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj @@ -11,6 +11,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/UnitTests/Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/UnitTests/Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj index cc7229212c29b4..9e5f103475701b 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/UnitTests/Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/UnitTests/Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj @@ -8,6 +8,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj index 41ef41a8e47b40..c5420188cbc6fe 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index b198e88c3e4169..4d53e1b452d9db 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj index 63de421edb59e1..aa0e5b63c33ee1 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj @@ -25,4 +25,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index a432b81e669d26..babbacd5fab98b 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -35,4 +35,13 @@ PackAsAnalyzer="true" /> + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs b/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs index 789d6718f41519..e893e9e6851da9 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Options/src/OptionsBuilderExtensions.cs @@ -11,8 +11,6 @@ namespace Microsoft.Extensions.DependencyInjection /// /// Extension methods for adding configuration-related options services to the DI container via . /// - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2091:UnrecognizedReflectionPattern", - Justification = "Workaround for https://github.com/mono/linker/issues/1416. Outer method has been annotated with DynamicallyAccessedMembers.")] public static class OptionsBuilderExtensions { /// diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Microsoft.Extensions.Options.SourceGeneration.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Microsoft.Extensions.Options.SourceGeneration.Unit.Tests.csproj index 38b388d44c6e8b..79d3840486f2d7 100644 --- a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Microsoft.Extensions.Options.SourceGeneration.Unit.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Microsoft.Extensions.Options.SourceGeneration.Unit.Tests.csproj @@ -27,11 +27,11 @@ + - diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Microsoft.Extensions.Options.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Microsoft.Extensions.Options.SourceGeneration.Tests.csproj index 2507fb84c7b5d8..3e96b81d68a9d8 100644 --- a/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Microsoft.Extensions.Options.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Microsoft.Extensions.Options.SourceGeneration.Tests.csproj @@ -24,11 +24,11 @@ + - diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj index b07ada6c020956..c6323a76266d7e 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -10,4 +10,10 @@ + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 10b1465ea60f6c..47607b70e61fad 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -30,4 +30,13 @@ Microsoft.Extensions.Primitives.StringSegment + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj index 449de04ed83fed..897c9f5f7b0c46 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj @@ -11,6 +11,9 @@ + + + diff --git a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj index e2148d594c9f21..19e6df5633997a 100644 --- a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj +++ b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj @@ -29,12 +29,6 @@ - - @@ -184,14 +193,14 @@ LibraryImportGenerator; JSImportGenerator; Microsoft.Interop.SourceGeneration; + Microsoft.Extensions.Logging.Generators.Roslyn4.4; + Microsoft.Extensions.Options.SourceGeneration; System.Text.Json.SourceGeneration.Roslyn4.4; System.Text.RegularExpressions.Generator; - Microsoft.Extensions.Caching.Abstractions; Microsoft.Extensions.Caching.Memory; Microsoft.Extensions.Configuration; - Microsoft.Extensions.Configuration.Abstractions; Microsoft.Extensions.Configuration.Binder; Microsoft.Extensions.Configuration.CommandLine; Microsoft.Extensions.Configuration.EnvironmentVariables; @@ -201,28 +210,21 @@ Microsoft.Extensions.Configuration.UserSecrets; Microsoft.Extensions.Configuration.Xml; Microsoft.Extensions.DependencyInjection; - Microsoft.Extensions.DependencyInjection.Abstractions; Microsoft.Extensions.Diagnostics; - Microsoft.Extensions.Diagnostics.Abstractions; - Microsoft.Extensions.FileProviders.Abstractions; Microsoft.Extensions.FileProviders.Composite; Microsoft.Extensions.FileProviders.Physical; Microsoft.Extensions.FileSystemGlobbing; Microsoft.Extensions.Hosting; - Microsoft.Extensions.Hosting.Abstractions; Microsoft.Extensions.Http; Microsoft.Extensions.Logging; - Microsoft.Extensions.Logging.Abstractions; Microsoft.Extensions.Logging.Configuration; Microsoft.Extensions.Logging.Console; Microsoft.Extensions.Logging.Debug; Microsoft.Extensions.Logging.EventLog; Microsoft.Extensions.Logging.EventSource; Microsoft.Extensions.Logging.TraceSource; - Microsoft.Extensions.Options; Microsoft.Extensions.Options.ConfigurationExtensions; Microsoft.Extensions.Options.DataAnnotations; - Microsoft.Extensions.Primitives; System.Diagnostics.EventLog; System.Formats.Cbor; System.Security.Cryptography.Pkcs; diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 3d85094538e5e9..6fc1288c56a3b5 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -38,7 +38,7 @@ - + $(WasmObjDir)\pinvoke-table.h diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index 32392078c50608..9c2e43f2696b99 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -5,6 +5,7 @@ $(WasmEnableExceptionHandling) false + Mono diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index d6ac8e4fa1fd40..826ed0b6f28db9 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -16,7 +16,7 @@ - + $(WasiObjDir)\pinvoke-table.h diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 2e34d343e96559..01f96edb3f6015 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -117,7 +117,8 @@ --> - + + diff --git a/src/native/managed/compile-native.proj b/src/native/managed/compile-native.proj index bede6454426570..bb524eecee3095 100644 --- a/src/native/managed/compile-native.proj +++ b/src/native/managed/compile-native.proj @@ -35,6 +35,6 @@ ReferenceOutputAssembly="false" AdditionalProperties="%(AdditionalProperties);$(SplitSubprojectProps)" Targets="Publish" - Condition="$(SupportsNativeAotComponents)"/> + Condition="'$(SupportsNativeAotComponents)' == 'true'"/> diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs index 619921fe530319..b214fb74573fe4 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ConvertDllsToWebCil.cs @@ -6,7 +6,6 @@ using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; namespace Microsoft.NET.Sdk.WebAssembly; @@ -133,7 +132,7 @@ private TaskItem ConvertDll(string tmpDir, ITaskItem candidate) if (Utils.IsNewerThan(dllFilePath, finalWebcil)) { var tmpWebcil = Path.Combine(tmpDir, webcilFileName); - var logAdapter = new LogAdapter(Log); + var logAdapter = new Microsoft.WebAssembly.Build.Tasks.LogAdapter(Log); var webcilWriter = Microsoft.WebAssembly.Build.Tasks.WebcilConverter.FromPortableExecutable(inputPath: dllFilePath, outputPath: tmpWebcil, logger: logAdapter); webcilWriter.ConvertToWebcil(); diff --git a/src/tasks/WasmAppBuilder/IcallTableGenerator.cs b/src/tasks/WasmAppBuilder/IcallTableGenerator.cs index 5d4d3ec7ede384..cc55684aef6e00 100644 --- a/src/tasks/WasmAppBuilder/IcallTableGenerator.cs +++ b/src/tasks/WasmAppBuilder/IcallTableGenerator.cs @@ -10,9 +10,10 @@ using System.Reflection; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; using JoinedString; +namespace Microsoft.WebAssembly.Build.Tasks; + internal sealed class IcallTableGenerator { public string[]? Cookies { get; private set; } @@ -24,16 +25,19 @@ internal sealed class IcallTableGenerator private LogAdapter Log { get; set; } private readonly Func _fixupSymbolName; + private bool _isCoreClr; + // // Given the runtime generated icall table, and a set of assemblies, generate // a smaller linked icall table mapping tokens to C function names // The runtime icall table should be generated using // mono --print-icall-table // - public IcallTableGenerator(string? runtimeIcallTableFile, Func fixupSymbolName, LogAdapter log) + public IcallTableGenerator(string? runtimeIcallTableFile, Func fixupSymbolName, LogAdapter log, bool isCoreClr) { Log = log; _fixupSymbolName = fixupSymbolName; + _isCoreClr = isCoreClr; if (runtimeIcallTableFile != null) ReadTable(runtimeIcallTableFile); } @@ -206,7 +210,7 @@ private void ProcessType(Type type) void AddSignature(Type type, MethodInfo method) { - string? signature = SignatureMapper.MethodToSignature(method, Log); + string? signature = _isCoreClr ? CoreClr.SignatureMapper.MethodToSignature(method, Log) : Mono.SignatureMapper.MethodToSignature(method, Log); if (signature == null) { throw new LogAsErrorException($"Unsupported parameter type in method '{type.FullName}.{method.Name}'"); diff --git a/src/tasks/WasmAppBuilder/LogAdapter.cs b/src/tasks/WasmAppBuilder/LogAdapter.cs index 8a068047e2f4a6..d0b74d9a00de11 100644 --- a/src/tasks/WasmAppBuilder/LogAdapter.cs +++ b/src/tasks/WasmAppBuilder/LogAdapter.cs @@ -8,7 +8,7 @@ #nullable enable -namespace WasmAppBuilder; +namespace Microsoft.WebAssembly.Build.Tasks; public sealed class LogAdapter { diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj index c1e48494c32e1e..a196a20e0256a4 100644 --- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj @@ -15,14 +15,6 @@ - - - - - - - - @@ -56,7 +48,9 @@ - + + + diff --git a/src/tasks/WasmAppBuilder/WebcilConverter.cs b/src/tasks/WasmAppBuilder/WebcilConverter.cs index 8012fa6d5e388c..048e47991a9686 100644 --- a/src/tasks/WasmAppBuilder/WebcilConverter.cs +++ b/src/tasks/WasmAppBuilder/WebcilConverter.cs @@ -8,7 +8,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; namespace Microsoft.WebAssembly.Build.Tasks; diff --git a/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs b/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs index 6bf40b396ec20b..a6b2845549f43f 100644 --- a/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs +++ b/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs @@ -10,7 +10,6 @@ using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using System.Diagnostics.CodeAnalysis; -using WasmAppBuilder; using JoinedString; // @@ -20,6 +19,8 @@ #nullable enable +namespace Microsoft.WebAssembly.Build.Tasks.CoreClr; + internal sealed class InterpToNativeGenerator { private LogAdapter Log { get; set; } diff --git a/src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs b/src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs index b1722487c6a277..f98b4d0f8e499e 100644 --- a/src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs +++ b/src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs @@ -10,9 +10,8 @@ using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; -namespace Microsoft.WebAssembly.Build.Tasks; +namespace Microsoft.WebAssembly.Build.Tasks.CoreClr; public class ManagedToNativeGenerator : Task { @@ -73,7 +72,7 @@ private void ExecuteInternal(LogAdapter log) Dictionary _symbolNameFixups = new(); List managedAssemblies = FilterOutUnmanagedBinaries(Assemblies); var pinvoke = new PInvokeTableGenerator(FixupSymbolName, log, IsLibraryMode); - var icall = new IcallTableGenerator(RuntimeIcallTableFile, FixupSymbolName, log); + var icall = new IcallTableGenerator(RuntimeIcallTableFile, FixupSymbolName, log, isCoreClr: true); var resolver = new PathAssemblyResolver(managedAssemblies); using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib"); diff --git a/src/tasks/WasmAppBuilder/coreclr/PInvokeCollector.cs b/src/tasks/WasmAppBuilder/coreclr/PInvokeCollector.cs index 4dfc8fc6d8214b..66b2a6223816aa 100644 --- a/src/tasks/WasmAppBuilder/coreclr/PInvokeCollector.cs +++ b/src/tasks/WasmAppBuilder/coreclr/PInvokeCollector.cs @@ -9,9 +9,10 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; -using WasmAppBuilder; using JoinedString; +namespace Microsoft.WebAssembly.Build.Tasks.CoreClr; + #pragma warning disable CA1067 #pragma warning disable CS0649 internal sealed class PInvoke : IEquatable diff --git a/src/tasks/WasmAppBuilder/coreclr/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/coreclr/PInvokeTableGenerator.cs index b3d9c43f6cbd51..2d99489b0fb791 100644 --- a/src/tasks/WasmAppBuilder/coreclr/PInvokeTableGenerator.cs +++ b/src/tasks/WasmAppBuilder/coreclr/PInvokeTableGenerator.cs @@ -12,9 +12,10 @@ using System.Runtime.InteropServices; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; using JoinedString; +namespace Microsoft.WebAssembly.Build.Tasks.CoreClr; + internal sealed class PInvokeTableGenerator { private LogAdapter Log { get; set; } diff --git a/src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs b/src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs index a5a5bcb2d4993f..15f13f819ee5ea 100644 --- a/src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs +++ b/src/tasks/WasmAppBuilder/coreclr/SignatureMapper.cs @@ -6,7 +6,8 @@ using System.Linq; using System.Reflection; using System.Text; -using WasmAppBuilder; + +namespace Microsoft.WebAssembly.Build.Tasks.CoreClr; internal static class SignatureMapper { diff --git a/src/tasks/WasmAppBuilder/mono/InterpToNativeGenerator.cs b/src/tasks/WasmAppBuilder/mono/InterpToNativeGenerator.cs index c231e70be88f1c..423ed17183beb2 100644 --- a/src/tasks/WasmAppBuilder/mono/InterpToNativeGenerator.cs +++ b/src/tasks/WasmAppBuilder/mono/InterpToNativeGenerator.cs @@ -10,7 +10,6 @@ using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using System.Diagnostics.CodeAnalysis; -using WasmAppBuilder; using JoinedString; // @@ -20,6 +19,8 @@ #nullable enable +namespace Microsoft.WebAssembly.Build.Tasks.Mono; + internal sealed class InterpToNativeGenerator { private LogAdapter Log { get; set; } diff --git a/src/tasks/WasmAppBuilder/mono/ManagedToNativeGenerator.cs b/src/tasks/WasmAppBuilder/mono/ManagedToNativeGenerator.cs index cb268cfaab77de..047f0d11169d1e 100644 --- a/src/tasks/WasmAppBuilder/mono/ManagedToNativeGenerator.cs +++ b/src/tasks/WasmAppBuilder/mono/ManagedToNativeGenerator.cs @@ -10,9 +10,8 @@ using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; -namespace Microsoft.WebAssembly.Build.Tasks; +namespace Microsoft.WebAssembly.Build.Tasks.Mono; public class ManagedToNativeGenerator : Task { @@ -72,7 +71,7 @@ private void ExecuteInternal(LogAdapter log) if (ShouldRun(managedAssemblies)) { var pinvoke = new PInvokeTableGenerator(FixupSymbolName, log, IsLibraryMode); - var icall = new IcallTableGenerator(RuntimeIcallTableFile, FixupSymbolName, log); + var icall = new IcallTableGenerator(RuntimeIcallTableFile, FixupSymbolName, log, isCoreClr: false); var resolver = new PathAssemblyResolver(managedAssemblies); using var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib"); diff --git a/src/tasks/WasmAppBuilder/mono/PInvokeCollector.cs b/src/tasks/WasmAppBuilder/mono/PInvokeCollector.cs index ad6bc414adc056..1116f67cb56c66 100644 --- a/src/tasks/WasmAppBuilder/mono/PInvokeCollector.cs +++ b/src/tasks/WasmAppBuilder/mono/PInvokeCollector.cs @@ -9,7 +9,8 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; -using WasmAppBuilder; + +namespace Microsoft.WebAssembly.Build.Tasks.Mono; #pragma warning disable CA1067 #pragma warning disable CS0649 diff --git a/src/tasks/WasmAppBuilder/mono/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/mono/PInvokeTableGenerator.cs index a15faea3873384..e7065ba6f5ab9c 100644 --- a/src/tasks/WasmAppBuilder/mono/PInvokeTableGenerator.cs +++ b/src/tasks/WasmAppBuilder/mono/PInvokeTableGenerator.cs @@ -12,9 +12,10 @@ using System.Runtime.InteropServices; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using WasmAppBuilder; using JoinedString; +namespace Microsoft.WebAssembly.Build.Tasks.Mono; + internal sealed class PInvokeTableGenerator { private readonly Dictionary _assemblyDisableRuntimeMarshallingAttributeCache = new(); diff --git a/src/tasks/WasmAppBuilder/mono/SignatureMapper.cs b/src/tasks/WasmAppBuilder/mono/SignatureMapper.cs index 3638e432f0ce38..e6bd78e1c5330d 100644 --- a/src/tasks/WasmAppBuilder/mono/SignatureMapper.cs +++ b/src/tasks/WasmAppBuilder/mono/SignatureMapper.cs @@ -7,7 +7,8 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -using WasmAppBuilder; + +namespace Microsoft.WebAssembly.Build.Tasks.Mono; internal static class SignatureMapper {