diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 21dbdc87f7ad..28fbb218599a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.22601.1", + "version": "1.1.0-beta.22606.1", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index e7459a51de24..08a242e88572 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f92d4d88590..1968757d625b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + f1cdc563ac5d4a87d886149a5527fdbe295782ad - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 + 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f - + https://github.com/dotnet/aspnetcore - 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 + 955e293332027bf86f51cd4ee176edfb68c89b3f https://github.com/dotnet/test-templates @@ -102,65 +102,65 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/sdk - fc06e695c5ab63fab7f9e89ed32fbcdb13e9992f + 21fafac880edeab5bba9026e10c1583641606391 - + https://github.com/dotnet/winforms - 8f1be5d8453763501aea20070bb6cabf97a49b34 + 4f4829de9a3b4c56496a60ec18d774ca40956b53 - + https://github.com/dotnet/wpf - 959913ec4f81cc388928fad0c95840bf3ee4962b + ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + ebf9aaa550b016202dcc4da55e89dfe7bc97346c - + https://github.com/dotnet/fsharp - 9f7329d4b4deab97603643eaa6607779d03568f1 + ebf9aaa550b016202dcc4da55e89dfe7bc97346c - + https://github.com/microsoft/vstest - b61973970a544ea30d03ac35b6f5535adb64fd4c + 8b3abffcfe607f7c11bf27c79a1096451a2f85c3 - + https://github.com/dotnet/linker - 13b8d6d68a07a47e52e13705313bc32d5540edf5 + f3469ca5e80e3701d90f8a376371eda940ba9687 linker - + https://github.com/dotnet/roslyn - 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 + ea0b6351c129c7decd9bf76f4388239509e28e0d - + https://github.com/dotnet/msbuild - d14b74d6f08ab7f2e17706359a38f8c22b569cb5 + a2490dd3f78cce4abc8f9e6f1b5268437332818f - + https://github.com/nuget/nuget.client - ea921bf1871b2799d9c130aad860db33e6577975 + be87c9ee11149780ce7de5fe35fe2653d565ccfd @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade-services - 7706f3fc349838553a94c3b0d84060b50c47d514 + d5675a0eb7702168568d849a3c3453258710aaf5 - + https://github.com/dotnet/arcade-services - 7706f3fc349838553a94c3b0d84060b50c47d514 + d5675a0eb7702168568d849a3c3453258710aaf5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2eca29ea891e..5318af9854a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 1.1.0-beta.22601.1 + 1.1.0-beta.22606.1 - 8.0.0-alpha.1.22531.9 + 8.0.0-alpha.1.22602.3 - 8.0.0-alpha.1.22551.2 + 8.0.0-alpha.1.22603.1 @@ -54,46 +54,46 @@ - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 - 8.0.0-alpha.1.22558.5 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 + 8.0.0-alpha.1.22605.17 0.2.0 - 8.0.100 - 8.0.100-alpha.1.22564.10 - 8.0.100-alpha.1.22564.10 + 8.0.100-alpha.1.22606.7 + 8.0.100-alpha.1.22606.7 + 8.0.100-alpha.1.22606.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.22605.1 2.1.0 - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 - 8.0.0-alpha.1.22552.1 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 + 8.0.0-alpha.1.22604.1 @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221111-01 + 17.5.0-preview-20221205-07 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d956837626e..fce77b6a182c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23" + "dotnet": "8.0.100-alpha.1.22579.5" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 27562569c61e..e348e1dcc094 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -94,6 +94,9 @@ done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt if [ "$installDotnet" == "true" ]; then echo " Installing dotnet..." (source ./eng/common/tools.sh && InitializeDotNetCli true) + + # TODO: Remove once runtime dependency is gone + bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --version 7.0.0 --runtime dotnet fi # Build bootstrap, if specified diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index cea712c1bfaf..8d4047ff8b20 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -25,8 +25,10 @@ - CS0618 + Requires https://github.com/dotnet/source-build/issues/2482 + CA1825 - Avoid unnecessary zero-length array allocations. + Requires aspnet to upgrade roslyn version. --> + CS0618;CA1825 diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index fc0d94c54a74..72dc0a0376e8 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 true $(LeakDetectionTasksBinDir) diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj index 87982bdef3dd..d458ea6f32f3 100755 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 $(XPlatTasksBinDir) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch new file mode 100644 index 000000000000..148bdb95424b --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 5 Dec 2022 23:35:39 +0000 +Subject: [PATCH] Disable package validation during source-build + +--- + eng/SourceBuild.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 63ebed2d9c..a1f0263955 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -56,6 +56,7 @@ + + $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) + $(InnerBuildArgs) /p:CrossgenOutput=false ++ $(InnerBuildArgs) /p:EnablePackageValidation=false + + + +-- +2.30.2.windows.1 \ No newline at end of file