Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #109638

Merged
merged 15 commits into from
Nov 21, 2024
Merged

[main] Update dependencies from dotnet/arcade #109638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7639f1b
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 8, 2024
7c15f83
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 10, 2024
c05e527
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 11, 2024
7b509fb
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 12, 2024
ae77f0a
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 12, 2024
af49550
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 13, 2024
c1bc981
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 13, 2024
c5047ac
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
ccda465
Update nonportable to portableBuild switch
ViktorHofer Nov 14, 2024
d6550fe
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 15, 2024
6a8d484
Don't build bundleproj in source-build
ViktorHofer Nov 18, 2024
30833a0
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 20, 2024
839e74b
Merge branch 'main' into darc-main-c0fa493e-0f71-482f-9bfb-b414e75226e6
akoeplinger Nov 20, 2024
3f26b4c
Set UseMonoRuntime=false to workaround WABT restore issue
akoeplinger Nov 21, 2024
3e50e5d
Update dependencies from /~https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 21, 2024
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 eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
</ItemGroup>
<ItemGroup>
<SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
<SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
<SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
<ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
</ItemGroup>
</When>
Expand Down
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,87 +88,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24556.2">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24556.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24530.1">
<Uri>/~https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -352,9 +352,9 @@
<Uri>/~https://github.com/dotnet/xharness</Uri>
<Sha>0ab02377ba48f064551d5231bbdbb0649eb7960c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24556.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24570.4">
<Uri>/~https://github.com/dotnet/arcade</Uri>
<Sha>662841251075524f81c205ab4595bf0b9da74475</Sha>
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24556.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24556.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24556.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24556.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24556.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24556.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24556.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24556.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24556.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24556.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24570.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24570.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24570.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24570.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24570.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24570.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24570.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24570.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: /~https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ parameters:
# The name of the job. This is included in the job ID.
# targetRID: ''
# The name of the target RID to use, instead of the one auto-detected by Arcade.
# nonPortable: false
# portableBuild: false
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
# linux-x64), and compiling against distro-provided packages rather than portable ones.
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
# default is portable mode.
# skipPublishValidation: false
# Disables publishing validation. By default, a check is performed to ensure no packages are
# published by source-build.
Expand Down
7 changes: 6 additions & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ steps:
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
fi

portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
fi

${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
Expand All @@ -85,7 +90,7 @@ steps:
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
Expand Down
6 changes: 3 additions & 3 deletions eng/common/native/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ case "$os" in
apt update

apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
libssl-dev libkrb5-dev zlib1g-dev pigz
libssl-dev libkrb5-dev zlib1g-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
else
echo "Unsupported distro. distro: $ID"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,10 +1761,10 @@ extends:
platforms:
- name: CentOS9
targetRID: centos.9-x64
nonPortable: true
portableBuild: false
container: SourceBuild_centos_x64
- name: NonexistentRID
baseOS: linux
targetRID: banana.24-x64
nonPortable: true
portableBuild: false
container: SourceBuild_centos_x64
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11",
"version": "9.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.100-rc.2.24474.11"
"dotnet": "9.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24556.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24556.2",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24556.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24570.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24527.3"
Expand Down
2 changes: 2 additions & 0 deletions src/mono/wasi/Wasi.Build.Tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishTrimmed>true</PublishTrimmed>
<!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
<UseMonoRuntime>false</UseMonoRuntime>
</PropertyGroup>
</Project>
2 changes: 2 additions & 0 deletions src/mono/wasm/Wasm.Build.Tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
<PropertyGroup>
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
<UseMonoRuntime>false</UseMonoRuntime>
</PropertyGroup>
</Project>
Loading