Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 21 additions & 23 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,29 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26315.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26315.110</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26315.110</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26315.110</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.6.26315.110</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26315.110</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26315.110</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.6.26315.110</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.6.26319.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.6.26319.105</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.6.26315.110</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.6.26315.110</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.6.26315.110</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-preview.6.26315.110</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-preview.6.26315.110</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.6.26315.110</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-preview.6.26315.110</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.6.26315.110</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.6.26315.110</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.6.26315.110</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.6.26315.110</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.6.26315.110</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.6.26315.110</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.6.26315.110</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.6.26319.105</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.6.26319.105</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.6.26319.105</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-preview.6.26319.105</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-preview.6.26319.105</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.6.26319.105</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-preview.6.26319.105</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.6.26319.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.6.26319.105</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.6.26319.105</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.6.26319.105</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.6.26319.105</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.6.26319.105</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.6.26319.105</SystemWindowsExtensionsPackageVersion>
<!-- dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26270.1</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand All @@ -46,7 +45,6 @@ This file should be imported by eng/Versions.props
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETCorePlatformsVersion>
<MicrosoftPrivateWinformsVersion>$(MicrosoftPrivateWinformsPackageVersion)</MicrosoftPrivateWinformsVersion>
<MicrosoftSourceLinkAzureReposGitVersion>$(MicrosoftSourceLinkAzureReposGitPackageVersion)</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>$(MicrosoftSourceLinkGitHubPackageVersion)</MicrosoftSourceLinkGitHubVersion>
Expand Down
90 changes: 43 additions & 47 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,78 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="370cd7b60d2dd85838d34e7e43a4622f3681d9a7" BarId="318763" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="b756a8d8a0e64905e16c81911bb09a8110bc3395" BarId="319511" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.6.26315.110">
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.6.26315.110">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26315.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26270.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>a6da41e859712fcb3f2e5ed3474bdf86b4e5046a</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26315.110">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +80,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26315.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26315.110">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26315.110">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26315.110">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -109,9 +105,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.6.26315.110">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>370cd7b60d2dd85838d34e7e43a4622f3681d9a7</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
13 changes: 1 addition & 12 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<Project>
<!-- 
Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
usually lags behind the version that WPF gets from CoreFx packages
-->
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>

<AdditionalPackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(ManagedCxx)'=='true'"/>

<ItemGroup>
<!--
Workaround - this should be removed when our tests are converted from Microsoft.NET.Sdk.WindowsDesktop => Microsoft.NET.Sdk
project
Expand Down
10 changes: 0 additions & 10 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,6 @@ using namespace System::Runtime::Versioning;
<AdditionalNugetIds Remove="%40(AdditionalNugetIds)" />
<AdditionalNugetIds Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])" />
</ItemGroup>
<!--
Removing the Microsoft.NETCore.Platforms directly and then
adding it again to remove the duplicate reference.
-->
<ItemGroup>
<PackageReference Remove="Microsoft.NETCore.Platforms" />
<PackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>
</Target>
<Target
Expand Down
6 changes: 5 additions & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ try {
if (-not $excludeCIBinarylog) {
$binaryLog = $true
}
$nodeReuse = $false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
$nodeReuse = $false
}
}

if (-not [string]::IsNullOrEmpty($binaryLogName)) {
Expand Down
6 changes: 5 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,11 @@ if [[ -z "$configuration" ]]; then
fi

if [[ "$ci" == true ]]; then
node_reuse=false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
node_reuse=false
fi
if [[ "$exclude_ci_binary_log" == false ]]; then
binary_log=true
fi
Expand Down
6 changes: 5 additions & 1 deletion eng/common/msbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Param(

try {
if ($ci) {
$nodeReuse = $false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
$nodeReuse = $false
}
}

MSBuild @extraArgs
Expand Down
6 changes: 5 additions & 1 deletion eng/common/msbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ done
. "$scriptroot/tools.sh"

if [[ "$ci" == true ]]; then
node_reuse=false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
node_reuse=false
fi
fi

MSBuild $extra_args
Expand Down
26 changes: 26 additions & 0 deletions eng/common/native/NativeAotSupported.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project>
<PropertyGroup>

<!-- Reject unsupported OS via RID prefix match -->
<_NativeAotSupportedOS Condition="
'$(TargetOS)' != 'browser' and
'$(TargetOS)' != 'haiku' and
'$(TargetOS)' != 'illumos' and
'$(TargetOS)' != 'netbsd' and
'$(TargetOS)' != 'solaris'
">true</_NativeAotSupportedOS>

<!-- Reject unsupported architectures via RID suffix match -->
<_NativeAotSupportedArch Condition="
'$(TargetArchitecture)' != 'wasm' and
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
">true</_NativeAotSupportedArch>

<NativeAotSupported Condition="
'$(NativeAotSupported)' == '' and
'$(_NativeAotSupportedOS)' == 'true' and
'$(_NativeAotSupportedArch)' == 'true'
">true</NativeAotSupported>

</PropertyGroup>
</Project>
Loading