diff --git a/Directory.Build.targets b/Directory.Build.targets index c89bc354683465..e7873291742e75 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -43,14 +43,6 @@ for Microsoft.NETCore.App.Runtime. and Microsoft.NETCore.App.Crossgen2.. --> - - %(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) - - - %(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f24b6a66dada51..31ba257a8ff0fc 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25574.1 19.1.0-alpha.1.25574.1 - 5.3.0-1.25619.109 - 5.3.0-1.25619.109 - 5.3.0-1.25619.109 - 11.0.100-alpha.1.25619.109 - 11.0.100-alpha.1.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 0.11.5-alpha.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 11.0.0-beta.25619.109 - 2.9.3-beta.25619.109 - 2.9.3-beta.25619.109 - 11.0.0-beta.25619.109 - 5.3.0-1.25619.109 - 11.0.0-alpha.1.25619.109 - 11.0.100-alpha.1.25619.109 - 11.0.0-alpha.1.25619.109 - 11.0.0-alpha.1.25619.109 - 7.3.0-preview.1.12009 - 7.3.0-preview.1.12009 - 7.3.0-preview.1.12009 - 7.3.0-preview.1.12009 - 11.0.0-alpha.1.25619.109 - 3.0.0-alpha.1.25619.109 - 11.0.0-alpha.1.25619.109 - 11.0.0-alpha.1.25619.109 - 11.0.0-alpha.1.25619.109 + 5.3.0-2.26057.107 + 5.3.0-2.26057.107 + 5.3.0-2.26057.107 + 11.0.100-alpha.1.26057.107 + 11.0.100-alpha.1.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 0.11.5-alpha.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 2.9.3-beta.26057.107 + 2.9.3-beta.26057.107 + 11.0.0-beta.26057.107 + 5.3.0-2.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.100-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 7.3.0-preview.1.5807 + 7.3.0-preview.1.5807 + 7.3.0-preview.1.5807 + 7.3.0-preview.1.5807 + 11.0.0-alpha.1.26057.107 + 3.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 11.0.0-beta.25574.4 11.0.0-beta.25574.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 430af8031ba241..69caa216e09890 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 a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9 - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9 - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 3df2923500447ee925d59f026c81720c7a9b4e4b - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 37bfb075f3ce49c8cd0abb7190eea8d121359813 - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe + 896160ec9eb0fdb1c019f698b39fa0923c9a316c https://github.com/dotnet/node diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b7eede4e50f60..8abfb71f72752e 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.5-RELEASE" +__FreeBSDBase="13.4-RELEASE" __FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" @@ -383,7 +383,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.3-RELEASE" + __FreeBSDBase="14.2-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; diff --git a/eng/native/ijw/getRefPackFolderFromSdk.ps1 b/eng/native/ijw/getRefPackFolderFromSdk.ps1 index 1b59248cb42adf..f4ebd3fec9d92d 100644 --- a/eng/native/ijw/getRefPackFolderFromSdk.ps1 +++ b/eng/native/ijw/getRefPackFolderFromSdk.ps1 @@ -14,14 +14,17 @@ $dotnetSdkVersion = $GlobalJson.tools.dotnet $sdkBundledVersionsFile = "$dotnetRoot/sdk/$dotnetSdkVersion/Microsoft.NETCoreSdk.BundledVersions.props" $refPackVersion = Select-Xml -Path $sdkBundledVersionsFile -XPath "/Project/PropertyGroup/BundledNETCoreAppPackageVersion" | %{$_.Node.InnerText} -$refPackTfmVersion = Select-Xml -Path $sdkBundledVersionsFile -XPath "/Project/PropertyGroup/BundledNETCoreAppTargetFrameworkVersion" | %{$_.Node.InnerText} -$refPackPath = "$dotnetRoot/packs/Microsoft.NETCore.App.Ref/$refPackVersion/ref/net$refPackTfmVersion" +# The actual path to assemblies is defined by the information in data/FrameworkList.xml, but we don't need to read that. Instead just find the path to System.Runtime.dll and use its folder. +$refPackBase = "$dotnetRoot/packs/Microsoft.NETCore.App.Ref/$refPackVersion/ref" +$systemRuntimeDll = Get-ChildItem -Path $refPackBase -Recurse -Filter "System.Runtime.dll" | Select-Object -First 1 -if (-not (Test-Path $refPackPath)) +if (-not $systemRuntimeDll) { Write-Error "Reference assemblies not found in the SDK folder. Did the SDK layout change? Did the SDK change how it describes the bundled runtime version?" exit 1 } +$refPackPath = Split-Path $systemRuntimeDll.FullName -Parent + Write-Output "refPackPath=$refPackPath" diff --git a/global.json b/global.json index 493c6d392f86d1..bdeb8f1fe8aee6 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100", + "version": "11.0.100-alpha.1.25618.104", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100" + "dotnet": "11.0.100-alpha.1.25618.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25619.109", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25619.109", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26057.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26057.107", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26057.107", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.25619.109" + "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26057.107" } }