diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4afc51d11..6f24a2b06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 3866b6c74bfba88182f3128de984aeae7fb0aee0 + d072c568ac75e6aa54411414007f2a3a827c2fad - + https://github.com/dotnet/windowsdesktop - 3866b6c74bfba88182f3128de984aeae7fb0aee0 + d072c568ac75e6aa54411414007f2a3a827c2fad - + https://github.com/dotnet/windowsdesktop - 3866b6c74bfba88182f3128de984aeae7fb0aee0 + d072c568ac75e6aa54411414007f2a3a827c2fad - + https://github.com/dotnet/windowsdesktop - 3866b6c74bfba88182f3128de984aeae7fb0aee0 + d072c568ac75e6aa54411414007f2a3a827c2fad - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ae2f60c950cc021921fce83c796cbcb5ff96c658 + 09ff1acdad2e7789908b5db9bb89896144c13042 - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f - + https://github.com/dotnet/aspnetcore - 0e106d4df982383dbb270efd106804e6d936f106 + 7bce93fd568bc6fafe4d0d9b29196865465e731f https://github.com/dotnet/test-templates @@ -95,32 +95,32 @@ 8c39d1efd8dbbcd7f44256dec316eb6d31377e58 - + https://github.com/dotnet/templating - 8dc3b166c744b63a99e31a1d738cfe2996656f35 + 75aea7efba1f83006587d04ac01bad627df74bc8 - + https://github.com/dotnet/templating - 8dc3b166c744b63a99e31a1d738cfe2996656f35 + 75aea7efba1f83006587d04ac01bad627df74bc8 - + https://github.com/dotnet/sdk - 8ae55bccedf0a1d39834316e8a62a1a02bc9a2cc + 6ac3b48ac4bbd1fce733651ce0e4259095e45bbd - + https://github.com/dotnet/sdk - 8ae55bccedf0a1d39834316e8a62a1a02bc9a2cc + 6ac3b48ac4bbd1fce733651ce0e4259095e45bbd - + https://github.com/dotnet/winforms - 629c4ac12a46ca5abb5dd37811821d869f901e39 + 73a51266a438bdba1b2ca4bc3d5ac6bf790f3143 - + https://github.com/dotnet/wpf - 725d92a18ed0e2d1620db5302d9413bfb68f2017 + bda4e10fd0e0d56b8baedc4674b7a5a9d336712c https://github.com/dotnet/fsharp @@ -142,14 +142,14 @@ linker - + https://github.com/dotnet/roslyn - 9942dc957472b9bf179b11742bc161ef6c79691e + 073b71936e04e334dacebea3cf00662b0a13a280 - + https://github.com/dotnet/msbuild - 32e260b1218b64b9985185602e667a064850ae85 + fb700f90493a0bf47623511edf28b1d6c114e4fa diff --git a/eng/Versions.props b/eng/Versions.props index 14d3fce8a..0ba3f0979 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-alpha.1.22064.4 + 7.0.0-preview.2.22074.5 - 7.0.0-alpha.1.22065.1 + 7.0.0-preview.1.22075.1 - 7.0.100-alpha.1.22064.1 + 7.0.100-preview.2.22074.5 @@ -52,44 +52,44 @@ - 7.0.0-alpha.1.22067.2 - 7.0.0-alpha.1.22067.2 - 7.0.0-alpha.1.22067.2 - 7.0.0-alpha.1.22067.2 - 7.0.0-alpha.1.22067.2 - 7.0.0-alpha.1.22067.2 + 7.0.0-preview.2.22074.8 + 7.0.0-preview.2.22074.8 + 7.0.0-preview.2.22074.8 + 7.0.0-preview.2.22074.8 + 7.0.0-preview.2.22074.8 + 7.0.0-preview.2.22074.8 0.2.0 - 7.0.100-alpha.1.22068.1 - 7.0.100-alpha.1.22068.1 + 7.0.100-preview.2.22075.4 + 7.0.100-preview.2.22075.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.22066.4 + 7.0.0-alpha.1.22073.5 - 7.0.0-alpha.1.22066.4 - 7.0.0-alpha.1.22066.4 - 7.0.0-alpha.1.22066.4 - 7.0.0-alpha.1.22066.4 - 7.0.0-alpha.1.22066.4 - 7.0.0-alpha.1.22066.4 + 7.0.0-alpha.1.22073.5 + 7.0.0-alpha.1.22073.5 + 7.0.0-alpha.1.22073.5 + 7.0.0-alpha.1.22073.5 + 7.0.0-alpha.1.22073.5 + 7.0.0-alpha.1.22073.5 2.1.0 - 7.0.0-alpha.1.22065.2 - 7.0.0-alpha.1.22065.2 - 7.0.0-alpha.1.22065.2 - 7.0.0-alpha.1.22065.2 + 7.0.0-preview.2.22075.2 + 7.0.0-preview.2.22075.2 + 7.0.0-preview.2.22075.2 + 7.0.0-preview.2.22075.2 diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index f94119820..0afe8be53 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644 @@ -6,6 +6,7 @@ Exe CSharpInteractive - netcoreapp3.1;net472 + net6.0;net472 + false @@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644 @@ -6,6 +6,7 @@ Exe Sub Main - netcoreapp3.1;net472 + net6.0;net472 + false diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index af3c0067e..ec6684750 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -394,12 +394,6 @@ namespace EndToEnd.Tests int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max(); if (latestMajorVersion == 7) { - // TODO: This block need to be updated when every template updates their default tfm. - // Currently winforms updated their default templates target but not others. - if (template.StartsWith("wpf")) - { - return "net6.0"; - } return $"net{latestMajorVersion}.0"; }