diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75df55a6021f..2106e545184d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - 6e1f6b8ee9f18133d5c8f543753b38a30384eebe + d9fbe230be0a8ea04681244c8e012fb4179f6fa7 - + https://github.com/dotnet/windowsdesktop - 6e1f6b8ee9f18133d5c8f543753b38a30384eebe + d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 - + https://github.com/dotnet/windowsdesktop - 6e1f6b8ee9f18133d5c8f543753b38a30384eebe + d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 - + https://github.com/dotnet/windowsdesktop - 6e1f6b8ee9f18133d5c8f543753b38a30384eebe + d9fbe230be0a8ea04681244c8e012fb4179f6fa7 - + https://github.com/dotnet/llvm-project - e73d65f0f80655b463162bd41a8365377ba6565d + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 67d2570ccfbabda2fc80b783471596d3481ffeb2 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 67d2570ccfbabda2fc80b783471596d3481ffeb2 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 67d2570ccfbabda2fc80b783471596d3481ffeb2 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 67d2570ccfbabda2fc80b783471596d3481ffeb2 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 67d2570ccfbabda2fc80b783471596d3481ffeb2 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d - + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 + - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + 155ed403b07bb81d829b9824c7333c134790b129 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 - + https://github.com/dotnet/aspnetcore - 0e0cb263176b2ff6f048aa48c7870986c37d894d + cc39b00887d641e32e43ae6fee40ddd6ba3dd672 https://github.com/dotnet/test-templates @@ -103,74 +103,80 @@ cd8f3b66281574d2e879c33114d1b76ced3afe96 - + https://github.com/dotnet/sdk - 361ca8ea760d7ed69da76f0b968f3b119d5bd222 + 696acea4312e692c07ed5a9d96ef1445970fed40 - + https://github.com/dotnet/sdk - 361ca8ea760d7ed69da76f0b968f3b119d5bd222 + 696acea4312e692c07ed5a9d96ef1445970fed40 - + https://github.com/dotnet/sdk - 361ca8ea760d7ed69da76f0b968f3b119d5bd222 + 696acea4312e692c07ed5a9d96ef1445970fed40 - + https://github.com/dotnet/sdk - 361ca8ea760d7ed69da76f0b968f3b119d5bd222 + 696acea4312e692c07ed5a9d96ef1445970fed40 - + https://github.com/dotnet/winforms - ce337305aafff2839761d8c006894f9ff470e54b + 90e22465bfdecb5528979e8e9b935b132e68ce4c - + https://github.com/dotnet/wpf - 9aaba46c4c7a6d94a580d4bb1555a6d51fa97b02 + 2bdc217aadcb53ff6f45808dc1edefe433e60695 - + https://github.com/dotnet/fsharp - 4e67cca0eff2507bcc1e5c63ea10834949b92a8a + 9df54a09f63db0f6301b8419644771fa0e99a562 - + https://github.com/dotnet/fsharp - 4e67cca0eff2507bcc1e5c63ea10834949b92a8a + 9df54a09f63db0f6301b8419644771fa0e99a562 - + https://github.com/microsoft/vstest - ef0aa102e9c7d5cf55af06c2747d11e07d12b69a - + d94aafd04f9ebecda6d36cce3f8cc1605d88f4ed + - + https://github.com/dotnet/linker - 313671b195b1b36d56a8888a9a0e12edaac52c57 + a9060d14067758ca17f8da072f4d2aa238b90045 linker - + https://github.com/dotnet/roslyn - dc87952b28a159487ddab48586511b480a5c3488 + 76b6eb3e6b207a3bfe872f17b17008d2165da5f3 - + https://github.com/dotnet/msbuild - 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 - + a3b647d766676a735211a42aa0726d1d940ed13d + - + https://github.com/nuget/nuget.client - 745617ea6fc239737c80abb424e13faca4249bf1 + d22c6743bf6237c39b98d5d680e06e6c33e97f1c https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + + + https://github.com/dotnet/xdt + 698fdad58fa64a55f16cd9562c90224cc498ed02 + + + https://github.com/dotnet/emsdk - 216093204c415b6e37dfadfcbcf183881b443636 + 225b08896a758167cf6b491f3369b0a1d366fc6c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index d16aa470ee1a..07c7861716fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 7.0.0-rc.2.22424.12 + 8.0.0-alpha.1.22431.6 - 7.0.0-rc.2.22424.8 + 8.0.0-alpha.1.22456.6 @@ -53,46 +53,46 @@ - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 - 7.0.0-rc.2.22424.4 + 8.0.0-alpha.1.22464.15 + 8.0.0-alpha.1.22464.15 + 8.0.0-alpha.1.22464.15 + 8.0.0-alpha.1.22430.14 + 8.0.0-alpha.1.22464.15 + 8.0.0-alpha.1.22464.15 + 8.0.0-alpha.1.22464.15 0.2.0 - 7.0.100-rc.2.22425.6 - 7.0.100-rc.2.22425.6 - 7.0.100-rc.2.22425.6 + 8.0.100-alpha.1.22464.50 + 8.0.100-alpha.1.22464.50 + 8.0.100-alpha.1.22464.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.1.22422.12 + 8.0.0-alpha.1.22463.9 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 + 8.0.0-alpha.1.22429.10 + 8.0.0-alpha.1.22429.10 + 8.0.0-alpha.1.22463.9 + 8.0.0-alpha.1.22463.9 + 8.0.0-alpha.1.22463.9 + 8.0.0-alpha.1.22463.9 2.1.0 - 7.0.0-rc.2.22424.8 - 7.0.0-rc.2.22424.8 - 7.0.0-rc.2.22424.8 - 7.0.0-rc.2.22424.8 + 8.0.0-alpha.1.22416.7 + 8.0.0-alpha.1.22416.7 + 8.0.0-alpha.1.22463.1 + 8.0.0-alpha.1.22463.1 @@ -110,12 +110,16 @@ 5.0.403 6.0.302 + 7.0.100-rc.1.22416.16 5.0.13 6.0.1 + 7.0.0-preview.7.22376.6 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 + 7.0.0-rc.1.22362.6 + 7.0.0-preview.7.22377.1 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -126,12 +130,12 @@ - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + $(MicrosoftWinFormsProjectTemplates70PackageVersion) + $(MicrosoftWPFProjectTemplates70PackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - $(MicrosoftAspNetCoreAppRuntimePackageVersion) + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + $(MicrosoftAspNetCoreAppRuntime70PackageVersion) $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) @@ -174,7 +178,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220813-01 + 17.4.0-preview-20220913-02 7.0.0-preview.7.22375.6 @@ -209,7 +213,7 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.1.22411.1 + 8.0.0-alpha.1.22417.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/global.json b/global.json index c5f3fd850ade..06bf6c30f653 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "7.0.100-preview.7.22377.5", + "dotnet": "8.0.100-alpha.1.22430.2", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" + "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" ] } }, diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4c5a7e252418..8a3641a69618 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -25,8 +25,7 @@ - - + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index c7a7642e4ebd..d15c28ef2673 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -11,7 +11,7 @@ $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6470PackageVersion) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6480PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index cac2a23e18e5..2b502b21d67c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -76,6 +76,14 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) + + <_NET70RuntimePackVersion>7.0.0-preview.7.22375.6 + <_NET70TargetingPackVersion>7.0.0-preview.7.22375.6 + <_WindowsDesktop70RuntimePackVersion>7.0.0-preview.7.22377.1 + <_WindowsDesktop70TargetingPackVersion>7.0.0-preview.7.22377.1 + <_AspNet70RuntimePackVersion>7.0.0-preview.7.22376.6 + <_AspNet70TargetingPackVersion>7.0.0-preview.7.22376.6 + <_NET60RuntimePackVersion>6.0.$(VersionFeature60) <_NET60TargetingPackVersion>6.0.$(VersionFeature60) <_WindowsDesktop60RuntimePackVersion>6.0.$(VersionFeature60) @@ -354,9 +362,9 @@ Copyright (c) .NET Foundation. All rights reserved. @(ImplicitPackageVariable->'', ' ') - + + + + + + + + + + + + + + + + + + + + + + + + + + - $(VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion) + $(VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - $(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion) + $(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) - $(VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion) + $(VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion) - $(VSRedistCommonNetCoreTargetingPackx6470PackageVersion) + $(VSRedistCommonNetCoreTargetingPackx6480PackageVersion) $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion) + $(VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion) 3.0.0 @@ -59,7 +59,7 @@ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -81,7 +81,7 @@ $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) @@ -91,7 +91,7 @@ aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824a1f..a45fd5c1a621 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,6 +63,7 @@ +