diff --git a/Directory.Build.props b/Directory.Build.props index 29ae777ccc..c90baaafb6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,6 +26,9 @@ true true + + + net11.0 diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1728d94751..c9ca28cf7b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 18.3.0-preview-26057-107 - 18.3.0-preview-26057-107 - 11.0.0-beta.26057.107 - 11.0.100-alpha.1.26057.107 - 11.0.0-alpha.1.26057.107 - 11.0.0-alpha.1.26057.107 + 18.4.0-preview-26064-107 + 18.4.0-preview-26064-107 + 11.0.0-beta.26064.107 + 11.0.100-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6f3c64ef4..82cc0fb882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,30 +1,30 @@ - + - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 896160ec9eb0fdb1c019f698b39fa0923c9a316c + 887f3d5a26e1001ee2777afde10cadcacb8cc735 diff --git a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj index 365344f0fe..c40fac5e1f 100644 --- a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj @@ -1,12 +1,13 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) False False + false diff --git a/global.json b/global.json index 391d4d2fa2..319a2eda44 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-alpha.1.25618.104", + "version": "11.0.100-alpha.1.26060.102", "allowPrerelease": true, "rollForward": "latestPatch", "paths": [ @@ -10,11 +10,11 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "11.0.100-alpha.1.25618.104" + "dotnet": "11.0.100-alpha.1.26060.102" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26057.107" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.107" } } diff --git a/src/externalPackages/externalPackages.proj b/src/externalPackages/externalPackages.proj index b62c5a1dc5..8ac780575a 100644 --- a/src/externalPackages/externalPackages.proj +++ b/src/externalPackages/externalPackages.proj @@ -1,7 +1,7 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch index 2ca86ba63f..f30f6b963b 100644 --- a/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch +++ b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch @@ -16,7 +16,7 @@ index 7308e50..5ade71c 100644 Library - net46;net8.0 -+ net10.0 ++ net11.0 full false Microsoft.Build.Locator diff --git a/src/externalPackages/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch b/src/externalPackages/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch index 17c470ac3e..43edee9055 100644 --- a/src/externalPackages/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch +++ b/src/externalPackages/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch @@ -71,7 +71,7 @@ index a69e3a94..5f20c850 100644 - - -+ ++ @@ -87,7 +87,7 @@ index 3abb6425..228e1b00 100644 - - -+ ++ @@ -103,7 +103,7 @@ index d6c4a004..6dabb04f 100644 - - -+ ++ @@ -119,7 +119,7 @@ index 93924d00..9fe91384 100644 - - -+ ++ @@ -135,7 +135,7 @@ index 27585ce6..a1021509 100644 - - -+ ++ @@ -151,7 +151,7 @@ index 8a5fb02f..4656e6ba 100644 - - -+ ++ @@ -167,7 +167,7 @@ index 4eeaf71d..447058cb 100644 - - -+ ++ @@ -183,7 +183,7 @@ index 3e248dff..7fbb42fc 100644 - - -+ ++ @@ -199,7 +199,7 @@ index 7bb205df..87509bc5 100644 - - -+ ++ @@ -215,7 +215,7 @@ index cd050bdb..4928460f 100644 - - -+ ++ @@ -231,7 +231,7 @@ index 3a8cc941..7196bf10 100644 - - -+ ++ @@ -247,7 +247,7 @@ index 35796ee3..b183c3d8 100644 - - -+ ++ @@ -263,7 +263,7 @@ index 0cd678b4..d23bd01f 100644 - - -+ ++ @@ -279,7 +279,7 @@ index 6d2851e3..4e891ba3 100644 - - -+ ++ @@ -295,7 +295,7 @@ index 5d84bd3c..ade764d0 100644 - - -+ ++ @@ -311,7 +311,7 @@ index 4bd3936f..b4792ad3 100644 - - -+ ++ @@ -327,7 +327,7 @@ index 736a05a3..6dc57145 100644 - - -+ ++ @@ -343,7 +343,7 @@ index 3842c724..68e6f484 100644 - - -+ ++ @@ -359,7 +359,7 @@ index ac8827dc..9b7a7c66 100644 - - -+ ++ @@ -374,7 +374,7 @@ index c38c48cf..fbfebff0 100644 - - -+ ++ @@ -390,7 +390,7 @@ index 0cedfee5..e54b1a25 100644 - - -+ ++ @@ -406,7 +406,7 @@ index a6a1cc4b..215f127f 100644 - - -+ ++ @@ -422,7 +422,7 @@ index 6da99ed6..3c77d2c7 100644 - - -+ ++ @@ -450,7 +450,7 @@ index 5c99b9f4..af3e4cd8 100644 - - -+ ++ @@ -466,7 +466,7 @@ index f2a5d1fa..61deda01 100644 - - -+ ++ @@ -506,7 +506,7 @@ index 038c6f03..0e3a9b36 100644 - - -+ ++ @@ -522,7 +522,7 @@ index f0cb4ac9..122e3ddd 100644 - - -+ ++ @@ -538,7 +538,7 @@ index 8c495bc8..798b42c4 100644 - - -+ ++ @@ -556,7 +556,7 @@ index c6e3a0f1..daf62b97 100644 - - -+ ++ @@ -566,8 +566,8 @@ index c6e3a0f1..daf62b97 100644 - - -+ -+ ++ ++ @@ -583,7 +583,7 @@ index 75593a0d..34c1c365 100644 - - -+ ++ @@ -599,7 +599,7 @@ index 084ff713..b99d79bf 100644 - - -+ ++ @@ -615,7 +615,7 @@ index 4eb8746c..11e9b471 100644 - - -+ ++ @@ -631,7 +631,7 @@ index 9c953e77..0c337ec8 100644 - - -+ ++ @@ -647,7 +647,7 @@ index 10ea8c0c..06f77fce 100644 - - -+ ++ @@ -663,7 +663,7 @@ index 3ba1e174..91e77402 100644 - - -+ ++ @@ -679,7 +679,7 @@ index 8312104d..884aa493 100644 - - -+ ++ @@ -695,7 +695,7 @@ index 464a316c..6dfc894d 100644 - - -+ ++ @@ -711,7 +711,7 @@ index 13215b74..1c63f8ac 100644 - - -+ ++ @@ -727,7 +727,7 @@ index 74c9d434..f0065339 100644 - - -+ ++ @@ -754,7 +754,7 @@ index c06ecea0..20b1dc40 100644 - - -+ ++ @@ -770,7 +770,7 @@ index 489d09eb..3602cba8 100644 - - -+ ++ @@ -786,7 +786,7 @@ index 324e201a..3d09d801 100644 - - -+ ++ @@ -802,7 +802,7 @@ index 98668f0f..691d0c6d 100644 - - -+ ++ @@ -818,7 +818,7 @@ index 1f7288b5..9d6218c5 100644 - - -+ ++ @@ -834,7 +834,7 @@ index d693eb77..a29fe464 100644 - - -+ ++ @@ -850,7 +850,7 @@ index daf32b8a..3d0dc105 100644 - - -+ ++ @@ -866,7 +866,7 @@ index 0a219d40..457072e0 100644 - - -+ ++ @@ -895,7 +895,7 @@ index 5b2f8ad9..d8e36f6c 100644  - netstandard1.0;netstandard2.0;net6.0 -+ netstandard2.0;net10.0 ++ netstandard2.0;net11.0 Mehdi Khalili, Claire Novotny https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE https://github.com/Humanizr/Humanizer diff --git a/src/externalPackages/projects/Directory.Build.props b/src/externalPackages/projects/Directory.Build.props index 6f2c588fb4..f8cb2f6aa8 100644 --- a/src/externalPackages/projects/Directory.Build.props +++ b/src/externalPackages/projects/Directory.Build.props @@ -4,6 +4,7 @@ $(NetCurrent) + false $(MSBuildProjectName) @@ -22,7 +23,7 @@ $(BaseIntermediateOutputPath)NuGet.config Microsoft.DotNet.SourceBuild.Tasks.XPlat - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', '$(XPlatSourceBuildTasksName)', '$(Configuration)', '$(NetCurrent)', '$(XPlatSourceBuildTasksName).dll')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', '$(XPlatSourceBuildTasksName)', '$(Configuration)', '$(XPlatSourceBuildTasksName).dll')) @@ -63,6 +64,9 @@ + + + diff --git a/src/packageSourceGenerator/PackageSourceGenerator.proj b/src/packageSourceGenerator/PackageSourceGenerator.proj index 57bd9fb356..8c24ae646f 100644 --- a/src/packageSourceGenerator/PackageSourceGenerator.proj +++ b/src/packageSourceGenerator/PackageSourceGenerator.proj @@ -3,9 +3,9 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) true - $(ArtifactsBinDir)PackageSourceGeneratorTask\$(Configuration)\$(NetCurrent)\PackageSourceGeneratorTask.dll + $(ArtifactsBinDir)PackageSourceGeneratorTask\$(Configuration)\PackageSourceGeneratorTask.dll $(RepoRoot)src\ ref true diff --git a/src/packageSourceGenerator/PackageSourceGeneratorTask/PackageSourceGeneratorTask.csproj b/src/packageSourceGenerator/PackageSourceGeneratorTask/PackageSourceGeneratorTask.csproj index 5e8d1e96ad..2ef82061c3 100644 --- a/src/packageSourceGenerator/PackageSourceGeneratorTask/PackageSourceGeneratorTask.csproj +++ b/src/packageSourceGenerator/PackageSourceGeneratorTask/PackageSourceGeneratorTask.csproj @@ -1,8 +1,9 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) enable + false diff --git a/src/referencePackages/Directory.Build.targets b/src/referencePackages/Directory.Build.targets index 566d0a037f..7ffe996007 100644 --- a/src/referencePackages/Directory.Build.targets +++ b/src/referencePackages/Directory.Build.targets @@ -49,21 +49,6 @@ - - - - $([System.Text.RegularExpressions.Regex]::Match('%(TargetFramework)', '\d+').Value).0.0 - - - - 6.0.2 - - - - 2.1.0 - - - - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) diff --git a/src/targetPacks/targetPacks.proj b/src/targetPacks/targetPacks.proj index 2c40b071db..f9efb68ad8 100644 --- a/src/targetPacks/targetPacks.proj +++ b/src/targetPacks/targetPacks.proj @@ -1,7 +1,7 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) diff --git a/src/textOnlyPackages/textOnlyPackages.proj b/src/textOnlyPackages/textOnlyPackages.proj index aa79066e21..8c40a92098 100644 --- a/src/textOnlyPackages/textOnlyPackages.proj +++ b/src/textOnlyPackages/textOnlyPackages.proj @@ -1,7 +1,7 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) diff --git a/tests/SbrpTests/Sbrp.Tests.csproj b/tests/SbrpTests/Sbrp.Tests.csproj index 0277d05283..9791f413d8 100644 --- a/tests/SbrpTests/Sbrp.Tests.csproj +++ b/tests/SbrpTests/Sbrp.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCurrent) + $(BundledNETCoreAppTargetFramework) enable