diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 476e525ab4f60a..2245f2c0e93180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 https://github.com/dotnet/runtime-assets @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 5ebf69650b9f7b4ecab485be840b3022420f7812 - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + 82d0268ba6ae13318bcf7fcbcccf83472593ca62 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 886f4da8295eae..9eabeec597ccc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,22 +62,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 2.5.1-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 - 7.0.0-beta.22561.2 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 2.5.1-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 + 7.0.0-beta.22572.6 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 561576be97c262..964610524760a3 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b16c47..e10a5968797463 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -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.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4624885e3bfebe..12a8ff94d8e960 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,11 +63,6 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -80,7 +75,6 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ - $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 449126943299e6..021555cf3381ad 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 5da6c42d85942f..5bcd1b3e07a958 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22561.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22572.6", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"