diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1f6f42d8..37f624dff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 5b4566f60f17de2be6c036fbbc0dbff154c2b797 + 90160553fc54e8923450ccc3eb575933387f1de6 - + https://github.com/dotnet/windowsdesktop - 5b4566f60f17de2be6c036fbbc0dbff154c2b797 + 90160553fc54e8923450ccc3eb575933387f1de6 - + https://github.com/dotnet/windowsdesktop - 5b4566f60f17de2be6c036fbbc0dbff154c2b797 + 90160553fc54e8923450ccc3eb575933387f1de6 - + https://github.com/dotnet/windowsdesktop - 5b4566f60f17de2be6c036fbbc0dbff154c2b797 + 90160553fc54e8923450ccc3eb575933387f1de6 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 - + https://github.com/dotnet/aspnetcore - 059939bda419646cb5e826df887f55b198963f6f + c5a5b3be8742953cd9cc495d17062df523e411b8 https://github.com/dotnet/test-templates @@ -102,63 +102,63 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - e7eb036b0ae8070c662257709678d2a5bfe72c9e + 0d1917869e18abd49b51b05b3fb746179a6c9fe0 - + https://github.com/dotnet/sdk - e7eb036b0ae8070c662257709678d2a5bfe72c9e + 0d1917869e18abd49b51b05b3fb746179a6c9fe0 - + https://github.com/dotnet/sdk - e7eb036b0ae8070c662257709678d2a5bfe72c9e + 0d1917869e18abd49b51b05b3fb746179a6c9fe0 - + https://github.com/dotnet/sdk - e7eb036b0ae8070c662257709678d2a5bfe72c9e + 0d1917869e18abd49b51b05b3fb746179a6c9fe0 - + https://github.com/dotnet/winforms - b6da3f99f9752be0e6fe21e79f9cac32aaab3256 + b4e971813740b6ce166dfcdeebc1844fde1e6409 - + https://github.com/dotnet/wpf - 0b66f4f0d52b0717c9970b8837c14f4d6c4db5a9 + 4c8edceb87d85fdc288a312c81dbaac07f780bac - + https://github.com/dotnet/fsharp - f2505da65c673b663aec584a8606e9b9334a1d17 + e13b879f21926f5da74b7427aaf7e21e9b6d9fd9 - + https://github.com/dotnet/fsharp - f2505da65c673b663aec584a8606e9b9334a1d17 + e13b879f21926f5da74b7427aaf7e21e9b6d9fd9 - + https://github.com/microsoft/vstest - 899a22286bb3edb5c22857b602231853378e1f59 + fbb47d3b5f82762a5c0076ecd11e216339b792e8 - + https://github.com/dotnet/runtime - 888bac304442e1a6883cfb922d21a74df910112d + 60f8edfbd99eb48af18a41a493d6cce29f1a31b3 - + https://github.com/dotnet/roslyn - 1497e87d967c5b7797edb5f782131508607139e5 + ac162b77f218ac99c1f1266cdf4375be43984047 - + https://github.com/dotnet/msbuild - 7f4bef8b46b3ebc275219ec936837ebf9f32c148 + fe79798bdb36571368176a6b9f8fdd15a5646500 - + https://github.com/nuget/nuget.client - 4b10ba9db66078700d3cea25198d185fe5030a27 + 216a1508fca5c09ca2532cdb203635990d55f7a1 diff --git a/eng/Versions.props b/eng/Versions.props index 03ac6886e..a20a204c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.5.23260.4 + 8.0.0-preview.5.23267.2 - 8.0.0-preview.5.23261.1 + 8.0.0-preview.5.23267.1 @@ -65,50 +65,50 @@ - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 - 8.0.0-preview.5.23262.1 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 + 8.0.0-preview.5.23268.3 0.2.0 - 8.0.100-preview.5.23262.3 - 8.0.100-preview.5.23262.3 - 8.0.100-preview.5.23262.3 + 8.0.100-preview.5.23268.34 + 8.0.100-preview.5.23268.34 + 8.0.100-preview.5.23268.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-2.23262.2 + 4.7.0-2.23268.5 - 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23268.5 - 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23268.5 + 8.0.0-preview.5.23268.5 + 8.0.0-preview.5.23268.5 + 8.0.0-preview.5.23268.5 + 8.0.0-preview.5.23268.5 + 8.0.0-preview.5.23268.5 2.1.0 - 8.0.0-preview.5.23261.7 - 8.0.0-preview.5.23261.7 - 8.0.0-preview.5.23261.7 - 8.0.0-preview.5.23261.7 + 8.0.0-preview.5.23268.2 + 8.0.0-preview.5.23268.2 + 8.0.0-preview.5.23268.2 + 8.0.0-preview.5.23268.2 @@ -222,7 +222,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23261.1 + 17.7.0-preview.23267.3 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/patches/roslyn/0002-Use-correct-ref-pack-versions.patch b/src/SourceBuild/patches/roslyn/0002-Use-correct-ref-pack-versions.patch deleted file mode 100644 index e8bd0fddb..000000000 --- a/src/SourceBuild/patches/roslyn/0002-Use-correct-ref-pack-versions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Thu, 20 Apr 2023 18:41:35 +0000 -Subject: [PATCH] Use correct ref-pack versions - -Backport: https://github.com/dotnet/roslyn/issues/67894 ---- - eng/targets/Imports.BeforeArcade.targets | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eng/targets/Imports.BeforeArcade.targets b/eng/targets/Imports.BeforeArcade.targets -index 968ecd42a6e..ba3300c847a 100644 ---- a/eng/targets/Imports.BeforeArcade.targets -+++ b/eng/targets/Imports.BeforeArcade.targets -@@ -17,11 +17,11 @@ - - - 6.0.0 -- 8.0.0-preview.3.23165.3 -+ $(MicrosoftNETCoreAppRefPackageVersion) - - - 6.0.0 -- 8.0.0-preview.3.23164.14 -+ $(MicrosoftAspNetCoreAppRefPackageVersion) - - - diff --git a/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch b/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch deleted file mode 100644 index f687d168f..000000000 --- a/src/SourceBuild/patches/runtime/0004-Fix-cast-type-to-conform-to-Roslyn-API.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 27 Apr 2023 09:51:08 -0500 -Subject: [PATCH] Fix cast type to conform to Roslyn API - -Backport: https://github.com/dotnet/runtime/pull/85466 ---- - .../gen/ComInterfaceGenerator/InlinedTypes.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs -index cb55e36b32c..ef2fe4f6d65 100644 ---- a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs -+++ b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/InlinedTypes.cs -@@ -53,7 +53,7 @@ static BlockSyntax Body() - GenericName( - Identifier("GetInstance"), - TypeArgumentList( -- SeparatedList( -+ SeparatedList( - new[] { PredefinedType(Token(SyntaxKind.ObjectKeyword)) }))))) - .AddArgumentListArguments( - Argument( diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 55e672eec..f1eea6e86 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -66,7 +66,6 @@ dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) - dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -119,14 +118,12 @@ win-$(AlternateArchitecture) - win-arm win-arm64 win-x86 win-x64 - win-arm @@ -172,13 +169,6 @@ packs/%(PackageName)/%(PackageVersion) - - Microsoft.NETCore.App.Host.$(ArmAppHostRid) - $(MicrosoftNETCoreAppHostPackageVersion) - $(TargetFramework) - packs/%(PackageName)/%(PackageVersion) - - Microsoft.NETCore.App.Host.$(Arm64AppHostRid) $(MicrosoftNETCoreAppHostPackageVersion) @@ -243,12 +233,6 @@ $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) - - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) - $(DownloadedArmNetCoreAppHostPackInstallerFileName) - - $(CoreSetupRootUrl)$(CoreSetupBlobVersion) @@ -256,7 +240,7 @@ + Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true'"> $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) @@ -300,7 +284,7 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi'"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxWixLibFileName) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index ec592b388..dc3555023 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -354,7 +354,6 @@ -NetStandardTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ -NetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ -AlternateNetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^ - -ArmNetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^ -Arm64NetCoreAppHostPackMSIFile '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ -AspNetTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ -WindowsDesktopTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 27cf3e616..aaa351247 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -198,9 +198,6 @@ - - - diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 0d9e9e302..d86377167 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -13,7 +13,6 @@ param( [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile, - [Parameter(Mandatory=$true)][string]$ArmNetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, @@ -65,7 +64,6 @@ function RunCandleForBundle -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" ` - -dArmNetCoreAppHostPackMsiSourcePath="$ArmNetCoreAppHostPackMSIFile" ` -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" ` -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" `