Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
de65c50
Backflow from https://github.com/dotnet/dotnet / 5121846 build 305296
dotnet-maestro[bot] Mar 10, 2026
ff6e1fe
Update dependencies from build 305296
dotnet-maestro[bot] Mar 10, 2026
57f181d
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
DonnaChen888 Mar 10, 2026
8a76502
Backflow from https://github.com/dotnet/dotnet / 542fea6 build 305563
dotnet-maestro[bot] Mar 11, 2026
2cf5d9f
Update dependencies from build 305563
dotnet-maestro[bot] Mar 11, 2026
2fbadcb
Update baselines
DonnaChen888 Mar 11, 2026
9b04fe2
Backflow from https://github.com/dotnet/dotnet / e405b1f build 305814
dotnet-maestro[bot] Mar 12, 2026
29ed31a
Merge main into darc-main-42f55340-3bb4-4b0f-9661-026bcf6564d1
dotnet-maestro[bot] Mar 12, 2026
50885f1
Update dependencies from build 305814
dotnet-maestro[bot] Mar 12, 2026
dcf7f00
Update dependencies from build 305927
dotnet-maestro[bot] Mar 13, 2026
982c8c7
Backflow from https://github.com/dotnet/dotnet / c059890 build 306027
dotnet-maestro[bot] Mar 13, 2026
02d4ffe
Merge main into darc-main-42f55340-3bb4-4b0f-9661-026bcf6564d1
dotnet-maestro[bot] Mar 13, 2026
162c1cd
Update dependencies from build 306027
dotnet-maestro[bot] Mar 13, 2026
83d346c
Fix nullability compiler errors from NuGet 7.6 API changes (#53489)
Copilot Mar 17, 2026
ea761e0
Set DOTNET_HOST_PATH in test environment for apphost task host
YuliiaKovalova Mar 18, 2026
969f9ec
Merge branch 'main' into darc-main-42f55340-3bb4-4b0f-9661-026bcf6564d1
YuliiaKovalova Mar 19, 2026
8e51286
Revert "Set DOTNET_HOST_PATH in test environment for apphost task host"
YuliiaKovalova Mar 19, 2026
ca8b34c
Update baselines
DonnaChen888 Mar 23, 2026
9ebeea7
Update template engine error text expectations to match new output fr…
nagilson Mar 23, 2026
dcc17b8
Set DOTNET_HOST_PATH in test environment for task host
nagilson Mar 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
<PackageVersion Include="Microsoft.DotNet.SignCheckTask" Version="$(ArcadeSdkVersion)" />
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
Expand Down
3 changes: 3 additions & 0 deletions eng/Signing.props
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
ReSign 3rd party files that we use in the product
-->
<ItemGroup>
<FileSignInfo Include="Humanizer.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
Expand Down Expand Up @@ -87,6 +88,8 @@
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
<!-- Roslyn apphosts -->
<FileSignInfo Condition="'$(TargetOS)' == 'osx'" Include="csc;vbc;VBCSCompiler" CertificateName="MacDeveloperHarden" />
<!-- MSBuild apphost -->
<FileSignInfo Condition="'$(TargetOS)' == 'osx'" Include="MSBuild" CertificateName="MacDeveloperHarden" />
</ItemGroup>

<!-- Filter out any test packages from ItemsToSign -->
Expand Down
268 changes: 134 additions & 134 deletions eng/Version.Details.props

Large diffs are not rendered by default.

540 changes: 270 additions & 270 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ stages:
displayName: Validate
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task SigningValidation -restore -msbuildEngine vs
arguments: -task SigningValidation -restore
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
${{ parameters.signingValidationAdditionalParameters }}
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/steps/publish-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ steps:
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(MaestroAccessToken)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
'$(akams-client-id)'
'$(microsoft-symbol-server-pat)'
Expand Down
52 changes: 52 additions & 0 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ usage()
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd13, freebsd14"
echo " for OpenBSD can be: openbsd"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand All @@ -27,6 +28,8 @@ __BuildArch=arm
__AlpineArch=armv7
__FreeBSDArch=arm
__FreeBSDMachineArch=armv7
__OpenBSDArch=arm
__OpenBSDMachineArch=armv7
__IllumosArch=arm7
__HaikuArch=arm
__QEMUArch=arm
Expand Down Expand Up @@ -82,6 +85,12 @@ __FreeBSDPackages+=" openssl"
__FreeBSDPackages+=" krb5"
__FreeBSDPackages+=" terminfo-db"

__OpenBSDVersion="7.8"
__OpenBSDPackages+=" icu4c"
__OpenBSDPackages+=" inotify-tools"
__OpenBSDPackages+=" openssl"
__OpenBSDPackages+=" heimdal-libs"

__IllumosPackages="icu"
__IllumosPackages+=" mit-krb5"
__IllumosPackages+=" openssl"
Expand Down Expand Up @@ -160,6 +169,8 @@ while :; do
__QEMUArch=aarch64
__FreeBSDArch=arm64
__FreeBSDMachineArch=aarch64
__OpenBSDArch=arm64
__OpenBSDMachineArch=aarch64
;;
armel)
__BuildArch=armel
Expand Down Expand Up @@ -235,6 +246,8 @@ while :; do
__UbuntuArch=amd64
__FreeBSDArch=amd64
__FreeBSDMachineArch=amd64
__OpenBSDArch=amd64
__OpenBSDMachineArch=amd64
__illumosArch=x86_64
__HaikuArch=x86_64
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
Expand Down Expand Up @@ -385,6 +398,10 @@ while :; do
__FreeBSDABI="14"
__SkipUnmount=1
;;
openbsd)
__CodeName=openbsd
__SkipUnmount=1
;;
illumos)
__CodeName=illumos
__SkipUnmount=1
Expand Down Expand Up @@ -593,6 +610,41 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
# shellcheck disable=SC2086
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
elif [[ "$__CodeName" == "openbsd" ]]; then
# determine mirrors
OPENBSD_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/$__OpenBSDVersion/$__OpenBSDMachineArch"

# download base system sets
ensureDownloadTool

BASE_SETS=(base comp)
for set in "${BASE_SETS[@]}"; do
FILE="${set}${__OpenBSDVersion//./}.tgz"
echo "Downloading $FILE..."
if [[ "$__hasWget" == 1 ]]; then
wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf -
else
curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf -
fi
done

PKG_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/${__OpenBSDVersion}/packages/${__OpenBSDMachineArch}"

echo "Installing packages into sysroot..."

for pkg in $__OpenBSDPackages; do
echo "Resolving package filename for $pkg..."

if [[ "$__hasWget" == 1 ]]; then
PKG_FILE=$(wget -qO- "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf -
else
PKG_FILE=$(curl -s "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf -
fi
done
elif [[ "$__CodeName" == "illumos" ]]; then
mkdir "$__RootfsDir/tmp"
pushd "$__RootfsDir/tmp"
Expand Down
15 changes: 13 additions & 2 deletions eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
unset(LINUX)
unset(FREEBSD)
unset(OPENBSD)
unset(ILLUMOS)
unset(ANDROID)
unset(TIZEN)
unset(HAIKU)

set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})

file(GLOB OPENBSD_PROBE "${CROSS_ROOTFS}/etc/signify/openbsd-*.pub")

if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
set(CMAKE_SYSTEM_NAME FreeBSD)
set(FREEBSD 1)
elseif(OPENBSD_PROBE)
set(CMAKE_SYSTEM_NAME OpenBSD)
set(OPENBSD 1)
elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
set(CMAKE_SYSTEM_NAME SunOS)
set(ILLUMOS 1)
Expand Down Expand Up @@ -53,6 +60,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
endif()
elseif(FREEBSD)
set(triple "aarch64-unknown-freebsd12")
elseif(OPENBSD)
set(triple "aarch64-unknown-openbsd")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "armel")
set(CMAKE_SYSTEM_PROCESSOR armv7l)
Expand Down Expand Up @@ -109,6 +118,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
endif()
elseif(FREEBSD)
set(triple "x86_64-unknown-freebsd12")
elseif(OPENBSD)
set(triple "x86_64-unknown-openbsd")
elseif(ILLUMOS)
set(TOOLCHAIN "x86_64-illumos")
elseif(HAIKU)
Expand Down Expand Up @@ -193,7 +204,7 @@ if(ANDROID)

# include official NDK toolchain script
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
elseif(FREEBSD)
elseif(FREEBSD OR OPENBSD)
# we cross-compile by instructing clang
set(CMAKE_C_COMPILER_TARGET ${triple})
set(CMAKE_CXX_COMPILER_TARGET ${triple})
Expand Down Expand Up @@ -291,7 +302,7 @@ endif()

# Specify compile options

if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
},
"tools": {
"dotnet": "11.0.100-preview.1.26104.118",
"dotnet": "11.0.100-preview.3.26161.119",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26153.117",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26153.117",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26162.121",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26162.121",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static string GetPackageDirectory(this LockFile lockFile, LockFileTargetL
var fallbackPackageFolders = packageFoldersCount > 1 ? packageFolders.Skip(1) : packageFolders;

var packageDirectory = new FallbackPackagePathResolver(userPackageFolder, fallbackPackageFolders)
.GetPackageDirectory(library.Name, library.Version);
.GetPackageDirectory(library.Name!, library.Version!)!;

return packageDirectory;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public NugetPackageMetadata(PackageSource packageSource, IPackageSearchMetadata
LicenseUrl = metadata.LicenseUrl;
License = metadata.LicenseMetadata?.License;
Identity = metadata.Identity;
LicenseExpression = metadata.LicenseMetadata?.LicenseExpression.ToString();
LicenseExpression = metadata.LicenseMetadata?.LicenseExpression?.ToString();
PackageVersion = metadata.Identity.Version;

Source = packageSource;
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.CommandLine;
Expand Down
4 changes: 4 additions & 0 deletions src/Layout/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,8 @@
<_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\VBCSCompiler.dll" />
</ItemGroup>

<ItemGroup>
<_MSBuildAppHost Include="$(OutputPath)MSBuild.dll" />
</ItemGroup>

</Project>
16 changes: 16 additions & 0 deletions src/Layout/redist/msbuild-entitlements.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.cs.debugger</key>
<true/>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>
17 changes: 8 additions & 9 deletions src/Layout/redist/targets/BundledManifests.targets
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<Version>[%(Version)]</Version>
</PackageDownload>

<PackageReference Include="Microsoft.DotNet.SignCheck" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.DotNet.SignCheckTask" IncludeAssets="build" PrivateAssets="all" />
</ItemGroup>

<Target Name="ValidateBundledManifestSigning"
Expand All @@ -61,7 +61,6 @@
$(BUILD_SOURCEBRANCH.Contains('release')) "
BeforeTargets="GenerateWorkloadManifestsWxs">
<PropertyGroup>
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
<SignCheckErrorLog Condition="'$(SignCheckErrorLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log</SignCheckErrorLog>
</PropertyGroup>
Expand All @@ -75,13 +74,13 @@
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
</ItemGroup>

<Exec Condition="'@(SignCheckWorkloadManifestMsiInputFiles->Count())' != '0'"
Command="$(SignCheckExe) ^
--recursive ^
-f UnsignedFiles ^
-i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^
-l $(SignCheckLog) ^
-e $(SignCheckErrorLog)" />
<Microsoft.DotNet.SignCheckTask.SignCheckTask
Condition="'@(SignCheckWorkloadManifestMsiInputFiles)' != ''"
InputFiles="@(SignCheckWorkloadManifestMsiInputFiles)"
LogFile="$(SignCheckLog)"
ErrorLogFile="$(SignCheckErrorLog)"
Recursive="true"
Format="UnsignedFiles" />

<Error
Text="Signing validation failed for workload manifest MSI. Check $(SignCheckErrorLog) for more information."
Expand Down
1 change: 1 addition & 0 deletions src/Layout/redist/targets/Crossgen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
<Exec Command="find $(InstallerOutputDirectory) -type d -exec chmod 755 {} \;" Condition="'$(OSName)' != 'win'" />
<Exec Command="find $(InstallerOutputDirectory) -type f -exec chmod 644 {} \;" Condition="'$(OSName)' != 'win'" />
<Exec Command="chmod 755 $(InstallerOutputDirectory)Roslyn/bincore/%(_RoslynAppHost.Filename)" Condition="'$(OSName)' != 'win'" />
<Exec Command="chmod 755 $(InstallerOutputDirectory)%(_MSBuildAppHost.Filename)" Condition="'$(OSName)' != 'win'" />
</Target>

</Project>
3 changes: 2 additions & 1 deletion src/Layout/redist/targets/GenerateInstallerLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
<_UseHardLinks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">false</_UseHardLinks>
</PropertyGroup>

<DeduplicateAssembliesWithLinks LayoutDirectory="$(RedistInstallerLayoutPath)sdk\" UseHardLinks="$(_UseHardLinks)" />
<!-- OSX is disabled until https://github.com/dotnet/runtime/issues/125332 is fixed. -->
<DeduplicateAssembliesWithLinks Condition="!$([MSBuild]::IsOSPlatform('OSX'))" LayoutDirectory="$(RedistInstallerLayoutPath)sdk\" UseHardLinks="$(_UseHardLinks)" />
</Target>

<!-- Copy the sdk layout into a temporary folder so that it's nested under "sdk\$(Version)\" which is
Expand Down
26 changes: 25 additions & 1 deletion src/Layout/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@
Condition="$(SharedFrameworkRid.StartsWith('osx'))" />
</Target>

<Target Name="CreateMSBuildAppHost">
<CreateAppHost AppHostSourcePath="$(NuGetPackageRoot)\microsoft.netcore.app.host.$(SharedFrameworkRid)\$(MicrosoftNETCoreAppHostPackageVersion)\runtimes\$(SharedFrameworkRid)\native\apphost$(ExeExtension)"
AppHostDestinationPath="%(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)%(_MSBuildAppHost.Filename)$(ExeExtension)"
AppBinaryName="%(_MSBuildAppHost.Filename)%(_MSBuildAppHost.Extension)"
IntermediateAssembly="%(_MSBuildAppHost.FullPath)"
EnableMacOSCodeSign="$(SharedFrameworkRid.StartsWith('osx'))" />

<!-- Copy the COM type library next to the apphost on Windows (needed for ITaskHost marshaling).
The .tlb is generated by the MSBuild build (CreateTypeLib target) and included in the
Microsoft.Build.Framework NuGet package under tools/net472/. -->
<PropertyGroup Condition="$(SharedFrameworkRid.StartsWith('win'))">
<_FrameworkTlbPath>$(NuGetPackageRoot)microsoft.build.framework\$(MicrosoftBuildVersion)\tools\net472\Microsoft.Build.Framework.tlb</_FrameworkTlbPath>
</PropertyGroup>
<Copy SourceFiles="$(_FrameworkTlbPath)"
DestinationFolder="%(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)"
SkipUnchangedFiles="true"
Condition="$(SharedFrameworkRid.StartsWith('win'))" />

<Exec Command="codesign --sign - --force --entitlements '$(MSBuildProjectDirectory)/msbuild-entitlements.plist' %(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)%(_MSBuildAppHost.Filename)$(ExeExtension)"
Condition="$(SharedFrameworkRid.StartsWith('osx'))" />
</Target>

<Target Name="PublishNETAnalyzers">
<!-- Microsoft.CodeAnalysis.NetAnalyzers -->
<PropertyGroup>
Expand Down Expand Up @@ -498,12 +520,13 @@
</Target>

<Target Name="ChmodPublishDir"
DependsOnTargets="GenerateCliRuntimeConfigurationFiles"
DependsOnTargets="GenerateCliRuntimeConfigurationFiles;CreateMSBuildAppHost"
Condition="'$(OSName)' != 'win'">

<Exec Command="find $(OutputPath) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(OutputPath) -type f -exec chmod 644 {} \;" />
<Exec Command="chmod 755 %(_RoslynAppHost.RootDir)%(_RoslynAppHost.Directory)%(_RoslynAppHost.Filename)" />
<Exec Command="chmod 755 %(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)%(_MSBuildAppHost.Filename)" />
</Target>

<Target Name="DeleteSymbolsFromPublishDir" DependsOnTargets="GenerateCliRuntimeConfigurationFiles">
Expand Down Expand Up @@ -551,6 +574,7 @@
GeneratePackagePruneData;
PublishContainersSdk;
GenerateCliRuntimeConfigurationFiles;
CreateMSBuildAppHost;
MakeFscRunnableAndMoveToPublishDir;
RemoveFscFilesAfterPublish;
PublishTargetExtensions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<OutputType>Exe</OutputType>
<RollForward>Major</RollForward>
<UseAppHost>false</UseAppHost>
<!-- This tool needs to run during the build.-->
<EnableKnownPackVersionUpdatesForCurrentTargetFramework>false</EnableKnownPackVersionUpdatesForCurrentTargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading
Loading