diff --git a/eng/Subsets.props b/eng/Subsets.props index 6e3fb61e30de03..c0d6664a1fc7d4 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -82,11 +82,6 @@ crossdacpack - - - true - - android+browser+wasi $(MonoCrossAOTTargetOS)+tvos+ios+maccatalyst @@ -522,7 +517,7 @@ - + @@ -578,7 +573,7 @@ - + @@ -635,11 +630,6 @@ - - - - - @@ -709,12 +699,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fd5914ac599a1..556628f9eff7d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness e85bb14e85357ab678c2bcb0b6f2bac634fdd49b - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 - + https://github.com/dotnet/dotnet - 25bec1af21db71468c5c2c3a588dd54d0e058e9d + 6b71c64e75168c7704e2e789c7920a3b681af364 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5cf906a95e6daa..b1d4e59b56aa15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,17 +36,17 @@ - 10.0.0-preview.25311.107 + 10.0.0-preview.25326.107 - 5.0.0-1.25311.107 + 5.0.0-1.25326.107 - 5.0.0-1.25311.107 - 5.0.0-1.25311.107 - 5.0.0-1.25311.107 + 5.0.0-1.25326.107 + 5.0.0-1.25326.107 + 5.0.0-1.25326.107 - 10.0.100-preview.6.25311.107 + 10.0.100-preview.6.25326.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 2.9.2-beta.25311.107 - 10.0.0-beta.25311.107 - 2.9.2-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 - 10.0.0-beta.25311.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 2.9.2-beta.25326.107 + 10.0.0-beta.25326.107 + 2.9.2-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 + 10.0.0-beta.25326.107 1.4.0 6.0.0-preview.1.102 - 10.0.0-preview.6.25311.107 + 10.0.0-preview.6.25326.107 6.0.0 - 10.0.0-preview.6.25311.107 - 10.0.0-preview.6.25311.107 + 10.0.0-preview.6.25326.107 + 10.0.0-preview.6.25326.107 6.0.0 4.6.1 @@ -128,16 +128,16 @@ 8.0.0 8.0.1 5.0.0 - 10.0.0-preview.6.25311.107 - 10.0.0-preview.6.25311.107 + 10.0.0-preview.6.25326.107 + 10.0.0-preview.6.25326.107 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-preview.6.25311.107 + 10.0.0-preview.6.25326.107 7.0.0 - 10.0.0-preview.6.25311.107 + 10.0.0-preview.6.25326.107 8.0.0 4.5.1 @@ -180,7 +180,7 @@ 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta5.25311.107 + 2.0.0-beta6.25326.107 3.1.16 2.1.0 2.0.3 @@ -226,7 +226,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25311.107 + 0.11.5-alpha.25326.107 10.0.0-preview.6.25302.1 @@ -258,7 +258,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport --> - 10.0.100-preview.6.25311.107 + 10.0.100-preview.6.25326.107 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 99c2326fc19015..c2917c1efc1cb7 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,15 +1,15 @@ parameters: sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog steps: - task: UseDotNet@2 - displayName: "Source Index: Use .NET 8 SDK" + displayName: "Source Index: Use .NET 9 SDK" inputs: packageType: sdk - version: 8.0.x + version: 9.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d6f005b5dabea6..8abfb71f72752e 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -295,8 +295,8 @@ while :; do ;; noble) # Ubuntu 24.04 __CodeName=noble - if [[ -n "$__LLDB_Package" ]]; then - __LLDB_Package="liblldb-18-dev" + if [[ -z "$__LLDB_Package" ]]; then + __LLDB_Package="liblldb-19-dev" fi ;; stretch) # Debian 9 diff --git a/eng/common/dotnet.cmd b/eng/common/dotnet.cmd new file mode 100644 index 00000000000000..527fa4bb38fb70 --- /dev/null +++ b/eng/common/dotnet.cmd @@ -0,0 +1,7 @@ +@echo off + +:: This script is used to install the .NET SDK. +:: It will also invoke the SDK with any provided arguments. + +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1 new file mode 100644 index 00000000000000..45e5676c9ebd04 --- /dev/null +++ b/eng/common/dotnet.ps1 @@ -0,0 +1,11 @@ +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +. $PSScriptRoot\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true + +# Invoke acquired SDK with args if they are provided +if ($args.count -gt 0) { + $env:DOTNET_NOLOGO=1 + & "$dotnetRoot\dotnet.exe" $args +} diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh new file mode 100755 index 00000000000000..2ef68235675f8c --- /dev/null +++ b/eng/common/dotnet.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +source $scriptroot/tools.sh +InitializeDotNetCli true # install + +# Invoke acquired SDK with args if they are provided +if [[ $# > 0 ]]; then + __dotnetDir=${_InitializeDotNetCli} + dotnetPath=${__dotnetDir}/dotnet + ${dotnetPath} "$@" +fi diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml index 670cf32c3bd1fa..c1b6fec45841e9 100644 --- a/eng/common/templates/vmr-build-pr.yml +++ b/eng/common/templates/vmr-build-pr.yml @@ -1,14 +1,5 @@ trigger: none -pr: - branches: - include: - - main - - release/* - paths: - exclude: - - documentation/* - - README.md - - CODEOWNERS +pr: none variables: - template: /eng/common/templates/variables/pool-providers.yml@self diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c9e39595b586cb..40f0aa86128e48 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -765,28 +765,13 @@ function MSBuild() { $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject - $possiblePaths = @( - # new scripts need to work with old packages, so we need to look for the old names/versions - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - - # This list doesn't need to be updated anymore and can eventually be removed. - (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) - ) - $selectedPath = $null - foreach ($path in $possiblePaths) { - if (Test-Path $path -PathType Leaf) { - $selectedPath = $path - break - } - } + $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll') + if (-not $selectedPath) { - Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.' + Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 } + $args += "/logger:$selectedPath" } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a7e84931510673..3def02a638d2e8 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -447,27 +447,13 @@ function MSBuild { fi local toolset_dir="${_InitializeToolset%/*}" - # new scripts need to work with old packages, so we need to look for the old names/versions - local selectedPath= - local possiblePaths=() - possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" ) - - # This list doesn't need to be updated anymore and can eventually be removed. - possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path - break - fi - done + local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" + if [[ -z "$selectedPath" ]]; then - Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly." + Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 fi + args+=( "-logger:$selectedPath" ) fi diff --git a/global.json b/global.json index a9314aa32efb5c..9bebbef47ff738 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.6.25302.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25311.107", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25311.107", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25311.107", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25326.107", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25326.107", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25326.107", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25311.107" + "Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25326.107" } } diff --git a/src/coreclr/vm/jithelpers.cpp b/src/coreclr/vm/jithelpers.cpp index b0b66f6347bcc5..fdeedf5533dd29 100644 --- a/src/coreclr/vm/jithelpers.cpp +++ b/src/coreclr/vm/jithelpers.cpp @@ -2386,9 +2386,12 @@ NOINLINE static void JIT_ReversePInvokeEnterRare2(ReversePInvokeFrame* frame, vo HCIMPL3_RAW(void, JIT_ReversePInvokeEnterTrackTransitions, ReversePInvokeFrame* frame, MethodDesc* pMD, void* secretArg) { _ASSERTE(frame != NULL && pMD != NULL); + _ASSERTE(!pMD->IsILStub() || secretArg != NULL); - if (pMD->IsILStub() && secretArg != NULL) + UMEntryThunk* pEntryThunk = NULL; + if (secretArg != NULL) { + pEntryThunk = ((UMEntryThunkData*)secretArg)->m_pUMEntryThunk; pMD = ((UMEntryThunkData*)secretArg)->m_pMD; } frame->pMD = pMD; @@ -2415,14 +2418,14 @@ HCIMPL3_RAW(void, JIT_ReversePInvokeEnterTrackTransitions, ReversePInvokeFrame* { // If we're in an IL stub, we want to trace the address of the target method, // not the next instruction in the stub. - JIT_ReversePInvokeEnterRare2(frame, _ReturnAddress(), pMD->IsILStub() ? ((UMEntryThunkData*)secretArg)->m_pUMEntryThunk : (UMEntryThunk*)NULL); + JIT_ReversePInvokeEnterRare2(frame, _ReturnAddress(), pEntryThunk); } } else { // If we're in an IL stub, we want to trace the address of the target method, // not the next instruction in the stub. - JIT_ReversePInvokeEnterRare(frame, _ReturnAddress(), pMD->IsILStub() ? ((UMEntryThunkData*)secretArg)->m_pUMEntryThunk : (UMEntryThunk*)NULL); + JIT_ReversePInvokeEnterRare(frame, _ReturnAddress(), pEntryThunk); } #if defined(TARGET_X86) && defined(TARGET_WINDOWS) diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets index 22504bd85a7d23..61e65f141cedab 100644 --- a/src/installer/Directory.Build.targets +++ b/src/installer/Directory.Build.targets @@ -2,10 +2,9 @@ $(InstallerName) - $(ArchiveName)-pgo - diff --git a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj index 71d7ae8213b62e..92a763f7032414 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj +++ b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj @@ -4,7 +4,7 @@ $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) Abstractions for modifying .NET host binaries false - true + true true true true diff --git a/src/installer/pkg/sfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props index e962fe15306977..96b249b57a17f4 100644 --- a/src/installer/pkg/sfx/Directory.Build.props +++ b/src/installer/pkg/sfx/Directory.Build.props @@ -12,7 +12,7 @@ true true - + true true true diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 80932ca681b896..1ea9a545581745 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -4,7 +4,6 @@ $(MicrosoftNetCoreAppFrameworkName) - false .NET Runtime diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj index 078991b13e8292..c0c96a9115eaf4 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -8,7 +8,6 @@ dotnet-apphost-pack dotnet-apphost-pack NetCore.AppHostPack - false true - false .NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) dotnet-runtime @@ -19,7 +18,7 @@ - +