diff --git a/Directory.Build.props b/Directory.Build.props index c70eaf929cf18f..5cca472ca43607 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -69,27 +69,26 @@ - + $(NetCoreAppCurrent) $(NetCoreAppPrevious) net10.0 - - + $(NetCoreAppCurrent) $(NetCoreAppMinimum) - 10.0 + 11.0 net$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) $(NetCoreAppToolCurrent) - 10.0 + 11.0 net$(AspNetCoreAppCurrentVersion) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f4a9fe98e3191a..b7069e004ddf98 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.25625.2 19.1.0-alpha.1.25625.2 - 5.4.0-2.26062.101 - 5.4.0-2.26062.101 - 5.4.0-2.26062.101 - 11.0.100-alpha.1.26062.101 - 11.0.100-alpha.1.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 0.11.5-alpha.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 11.0.0-beta.26062.101 - 2.9.3-beta.26062.101 - 2.9.3-beta.26062.101 - 11.0.0-beta.26062.101 - 5.4.0-2.26062.101 - 11.0.0-alpha.1.26062.101 - 11.0.100-alpha.1.26062.101 - 11.0.0-alpha.1.26062.101 - 11.0.0-alpha.1.26062.101 - 7.3.0-preview.1.6301 - 7.3.0-preview.1.6301 - 7.3.0-preview.1.6301 - 7.3.0-preview.1.6301 - 11.0.0-alpha.1.26062.101 - 3.0.0-alpha.1.26062.101 - 11.0.0-alpha.1.26062.101 - 11.0.0-alpha.1.26062.101 - 11.0.0-alpha.1.26062.101 + 5.4.0-2.26064.120 + 5.4.0-2.26064.120 + 5.4.0-2.26064.120 + 11.0.100-alpha.1.26064.120 + 11.0.100-alpha.1.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 0.11.5-alpha.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 11.0.0-beta.26064.120 + 2.9.3-beta.26064.120 + 2.9.3-beta.26064.120 + 11.0.0-beta.26064.120 + 5.4.0-2.26064.120 + 11.0.0-alpha.1.26064.120 + 11.0.100-alpha.1.26064.120 + 11.0.0-alpha.1.26064.120 + 11.0.0-alpha.1.26064.120 + 7.3.0-preview.1.6520 + 7.3.0-preview.1.6520 + 7.3.0-preview.1.6520 + 7.3.0-preview.1.6520 + 11.0.0-alpha.1.26064.120 + 3.0.0-alpha.1.26064.120 + 11.0.0-alpha.1.26064.120 + 11.0.0-alpha.1.26064.120 + 11.0.0-alpha.1.26064.120 11.0.0-beta.26059.1 11.0.0-beta.26059.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9f15114197255..1b12f253509c14 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 90a3b767fd10543cbaed7308406e0059dec0ffb7 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 90a3b767fd10543cbaed7308406e0059dec0ffb7 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 799df8d4c86ff50c83b7a57df9e3691eeab813ec - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets fd342f922435b2725113b5226c7e25fcf830a149 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 4d383e955786d8fa9b0880d00bdca12f9208c7f5 https://github.com/dotnet/node diff --git a/global.json b/global.json index 9f7a4aae95a271..1ba3f948d3f723 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "11.0.100-alpha.1.25618.104", + "version": "11.0.100-alpha.1.26060.102", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "11.0.100-alpha.1.25618.104" + "dotnet": "11.0.100-alpha.1.26060.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26062.101", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26062.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.120", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26064.120", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26064.120", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26062.101" + "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26064.120" } } diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props index e405de20604849..c4882ea694bff8 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props @@ -3,7 +3,7 @@ ilc true Exe - net$(BundledNETCoreAppTargetFrameworkVersion) + $(BundledNETCoreAppTargetFramework) 8002,NU1701 x64;x86 AnyCPU diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props index 3b38dc88c8bfa4..7970baaa0166dc 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.props +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props @@ -1,7 +1,7 @@ - net$(BundledNETCoreAppTargetFrameworkVersion) + $(BundledNETCoreAppTargetFramework) crossgen2 true Exe diff --git a/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj b/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj index 53c2345bc43826..fd9aab9ffef3cd 100644 --- a/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj +++ b/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj @@ -1,11 +1,11 @@ + $(BundledNETCoreAppTargetFramework) cdac-build-tool Exe enable AnyCPU - net$(BundledNETCoreAppTargetFrameworkVersion) true $(RuntimeBinDir)/cdac-build-tool true diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 3421d791ae5c99..14097715c7d9ac 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppToolCurrent) + $(BundledNETCoreAppTargetFramework) true false true @@ -14,6 +14,8 @@ false false false + + $([System.IO.Path]::GetDirectoryName('$(BundledRuntimeIdentifierGraphFile)'))\ @@ -42,15 +44,13 @@ + - - - - + + + - - <_WebAssemblySdkToolsDirectory Condition="'$(_WebAssemblySdkToolsDirectory)'==''">$(MSBuildThisFileDirectory)..\tools\ - <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0 + <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net11.0 <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472 <_WebAssemblySdkTasksAssembly Condition="'$(_WebAssemblySdkTasksAssembly)' == ''">$(_WebAssemblySdkToolsDirectory)\$(_WebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.dll diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj index 3b88e4a33e5e0a..8f36adf14547bf 100644 --- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj +++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj @@ -1,7 +1,7 @@ - net$(BundledNETCoreAppTargetFrameworkVersion) + $(BundledNETCoreAppTargetFramework) $(NoWarn);CA1050;CA1852;CA1861;CA2249;IDE0059;IDE0060;IDE0074 annotations false diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj index 4f081553e0de87..377baa7582b5d2 100644 --- a/src/tasks/installer.tasks/installer.tasks.csproj +++ b/src/tasks/installer.tasks/installer.tasks.csproj @@ -1,7 +1,7 @@ - net$(BundledNETCoreAppTargetFrameworkVersion) + $(BundledNETCoreAppTargetFramework) disable false false