diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 140efeea7..eeab35283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - 553cea01a5aded33ab2f1d089402e7f52a0fb3a2 + ff6716c6fcaad5bf160d269b01d683e23ac1a761 - + https://github.com/dotnet/windowsdesktop - 553cea01a5aded33ab2f1d089402e7f52a0fb3a2 + ff6716c6fcaad5bf160d269b01d683e23ac1a761 - + https://github.com/dotnet/windowsdesktop - 553cea01a5aded33ab2f1d089402e7f52a0fb3a2 + ff6716c6fcaad5bf160d269b01d683e23ac1a761 - + https://github.com/dotnet/windowsdesktop - 553cea01a5aded33ab2f1d089402e7f52a0fb3a2 + ff6716c6fcaad5bf160d269b01d683e23ac1a761 https://github.com/dotnet/llvm-project 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0d61bffbc4dd7ba7f5626accf28ba0d8fc273313 + 2f3fcca06499725469b6ae021be960e08d808c75 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 - + https://github.com/dotnet/aspnetcore - 991728c729ab6d67e1eb1b5de4329d116b5a83bb + d75ef8d825ac2134b2ea2e7a37b536e22b9f1619 https://github.com/dotnet/test-templates @@ -103,31 +103,31 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - ac557ba639f8f7329bad9e232c4e3224c362b1b1 + caa8aa1f7dee9c9f0b0d98afc44eaaec7ec48424 - + https://github.com/dotnet/sdk - ac557ba639f8f7329bad9e232c4e3224c362b1b1 + caa8aa1f7dee9c9f0b0d98afc44eaaec7ec48424 - + https://github.com/dotnet/sdk - ac557ba639f8f7329bad9e232c4e3224c362b1b1 + caa8aa1f7dee9c9f0b0d98afc44eaaec7ec48424 - + https://github.com/dotnet/sdk - ac557ba639f8f7329bad9e232c4e3224c362b1b1 + caa8aa1f7dee9c9f0b0d98afc44eaaec7ec48424 - + https://github.com/dotnet/winforms - 90e22465bfdecb5528979e8e9b935b132e68ce4c + 1b17d5b15bebc394af0a697c3ee0dffe285ae3b5 - + https://github.com/dotnet/wpf - 2bdc217aadcb53ff6f45808dc1edefe433e60695 + 29264ce9f09846bb0d7a403b6a005c7bd7187597 https://github.com/dotnet/fsharp @@ -143,9 +143,9 @@ 3c560f92eb7832d353f9cbeaa120b234e02ef027 - + https://github.com/dotnet/linker - 6e592a9088444c5fcb700ae1a1365acbf5f3fc21 + ddc7da6775ddeb2538bc327011867f65deb4c6f0 linker @@ -154,14 +154,14 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 02b334e3afaa105221d0adb49a7b224407c5334c + 48ab5664b8734afdf4aedba5f72a0663435eef16 - + https://github.com/nuget/nuget.client - fa9f471daebb817384840d162acc9a9592f88ce8 + abaa72f3390fba4bb65fb3c700f22104682bfae9 diff --git a/eng/Versions.props b/eng/Versions.props index 3e7cf0576..8b01c33b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22431.6 + 8.0.0-alpha.1.22468.2 - 8.0.0-alpha.1.22456.6 + 8.0.0-alpha.1.22468.2 @@ -53,46 +53,46 @@ - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 - 8.0.0-alpha.1.22465.17 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 + 8.0.0-alpha.1.22469.4 0.2.0 - 8.0.100-alpha.1.22466.3 - 8.0.100-alpha.1.22466.3 - 8.0.100-alpha.1.22466.3 + 8.0.100-alpha.1.22469.17 + 8.0.100-alpha.1.22469.17 + 8.0.100-alpha.1.22469.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22464.17 + 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22464.17 - 8.0.0-alpha.1.22464.17 - 8.0.0-alpha.1.22464.17 - 8.0.0-alpha.1.22464.17 - 8.0.0-alpha.1.22464.17 - 8.0.0-alpha.1.22464.17 + 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22468.3 2.1.0 - 8.0.0-alpha.1.22464.1 - 8.0.0-alpha.1.22464.1 - 8.0.0-alpha.1.22464.1 - 8.0.0-alpha.1.22464.1 + 8.0.0-alpha.1.22468.1 + 8.0.0-alpha.1.22468.1 + 8.0.0-alpha.1.22468.1 + 8.0.0-alpha.1.22468.1 diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch index bf87a65d5..660d2c914 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch @@ -88,11 +88,11 @@ index 471f88dbc..efd25efd1 100644 "allowPrerelease": true }, "tools": { -- "dotnet": "6.0.200", +- "dotnet": "6.0.401", + "dotnet": "7.0.100-preview.5.22307.18", "vs": { - "version": "17.0" - } + "version": "17.2.1" + }, diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1 index ef1959fc3..8cfecb6a0 100644 --- a/scripts/Deploy-MSBuild.ps1 diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 3b17c9f61..62fcb8940 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -402,7 +402,6 @@ namespace EndToEnd.Tests || template.StartsWith("xunit") || template.StartsWith("xunit") || template.StartsWith("wpf") - || template.StartsWith("winforms") || template.StartsWith("mvc") || template.StartsWith("web") || template.StartsWith("worker")