diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 269874f29..f231d5be6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 2ca4dea623bedeb3be50c752f3d97a7d65001ace + 730ffef0efec485925f717a411f690c77f54831a - + https://github.com/dotnet/windowsdesktop - 2ca4dea623bedeb3be50c752f3d97a7d65001ace + 730ffef0efec485925f717a411f690c77f54831a - + https://github.com/dotnet/windowsdesktop - 2ca4dea623bedeb3be50c752f3d97a7d65001ace + 730ffef0efec485925f717a411f690c77f54831a - + https://github.com/dotnet/windowsdesktop - 2ca4dea623bedeb3be50c752f3d97a7d65001ace + 730ffef0efec485925f717a411f690c77f54831a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 98ca34955f6b4018dcacdddbb7b02fc3e47bcf9b + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 - + https://github.com/dotnet/aspnetcore - cd73828a6b892f15264d6d740cf29160a803cf3f + 4d75ee9a7fbad112e29b8a1d77c7d96965f62b40 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 78d92166888264024dc54c4a12527df42efe910f + 33d4e69b44b347a437294656b9af947fe9597fd7 - + https://github.com/dotnet/sdk - 78d92166888264024dc54c4a12527df42efe910f + 33d4e69b44b347a437294656b9af947fe9597fd7 - + https://github.com/dotnet/sdk - 78d92166888264024dc54c4a12527df42efe910f + 33d4e69b44b347a437294656b9af947fe9597fd7 - + https://github.com/dotnet/sdk - 78d92166888264024dc54c4a12527df42efe910f + 33d4e69b44b347a437294656b9af947fe9597fd7 - + https://github.com/dotnet/winforms - f6eaa898b9f130b99b6249161e8133a6b91f8f8b + 3d45c8f711add6fc649a9a352d4b69205c446485 - + https://github.com/dotnet/wpf - ec69834f378fb98ef5f623db1c55610ac074001d + 0d2289f1b6fb0731a36c9ecc7b5e57ccb9e00e69 https://github.com/dotnet/fsharp @@ -137,9 +137,9 @@ e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/microsoft/vstest - 3b18b9e9ce06b32aadfff34814ff528db0c48d6c + d8ee1c1b86aeaaa44d2bbef3d9f5a89acd0c0eed @@ -148,32 +148,32 @@ linker - + https://github.com/dotnet/roslyn - 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 + 5ca760eb6aab71e70810c595a440429914698765 - + https://github.com/dotnet/msbuild - 3395128aee0bac96d105ad789232aa773a008437 + d9c24230c20a65c57a5a60f396d6d28336a64c74 - + https://github.com/nuget/nuget.client - 743503cb3c7e9ced2602ee2e29c38d63cc339451 + ca5029046d7b6e55f322c45abb7b342054543710 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0225fb13500779b09169201621d984bc84e62ae7 + ff2362091c3ce19e09606a7de927670ba5d1cb81 - + https://github.com/dotnet/emsdk - 0225fb13500779b09169201621d984bc84e62ae7 + ff2362091c3ce19e09606a7de927670ba5d1cb81 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index f5ff9139c..c32a309c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.23067.2 + 8.0.0-alpha.1.23075.2 - 8.0.0-alpha.1.23068.4 + 8.0.0-alpha.1.23076.1 @@ -58,46 +58,46 @@ - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 - 8.0.0-alpha.1.23075.1 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 + 8.0.0-alpha.1.23076.8 0.2.0 - 8.0.100-alpha.1.23075.4 - 8.0.100-alpha.1.23075.4 - 8.0.100-alpha.1.23075.4 + 8.0.100-alpha.1.23077.4 + 8.0.100-alpha.1.23077.4 + 8.0.100-alpha.1.23077.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.23074.4 + 8.0.0-alpha.1.23076.9 - 8.0.0-alpha.1.23074.4 - 8.0.0-alpha.1.23074.4 - 8.0.0-alpha.1.23074.4 - 8.0.0-alpha.1.23074.4 - 8.0.0-alpha.1.23074.4 - 8.0.0-alpha.1.23074.4 + 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23076.9 2.1.0 - 8.0.0-alpha.1.23074.1 - 8.0.0-alpha.1.23074.1 - 8.0.0-alpha.1.23074.1 - 8.0.0-alpha.1.23074.1 + 8.0.0-alpha.1.23076.3 + 8.0.0-alpha.1.23076.3 + 8.0.0-alpha.1.23076.3 + 8.0.0-alpha.1.23076.3 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230123-01 + 17.6.0-preview-20230126-02 8.0.0-alpha.1.22557.12 @@ -200,8 +200,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.23070.1 - 8.0.0-alpha.1.23070.1 + 8.0.0-alpha.1.23073.2 + 8.0.0-alpha.1.23073.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) diff --git a/src/SourceBuild/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/patches/razor/0001-Exclude-Analyzers-from-source-build.patch deleted file mode 100644 index 071ca05da..000000000 --- a/src/SourceBuild/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 16 Dec 2022 03:31:02 +0000 -Subject: [PATCH] Exclude Analyzers from source-build - -Backport: https://github.com/dotnet/razor/issues/8035 ---- - src/Compiler/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props -index e69a99bf3..f70902a08 100644 ---- a/src/Compiler/Directory.Build.props -+++ b/src/Compiler/Directory.Build.props -@@ -37,7 +37,7 @@ - $(WarningsNotAsErrors);xUnit1004 - - -- -+ - - - diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index af2de5738..df5d44475 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,4 +1,7 @@ + + 8.0.100 + @@ -6,11 +9,11 @@ - - - - - + + + + + @@ -22,10 +25,9 @@ %(Identity).Manifest-%(FeatureBand) - %(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests) $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + %(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests) $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) - $([MSBuild]::NormalizePath('%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi')) @@ -56,7 +58,9 @@ + Exclude="Microsoft.NET.Workload.Mono.ToolChain;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7"> + $([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi')))) + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 35b237b6e..3a0fd7fef 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -278,6 +278,11 @@ + + <_Manifests Include="@(BundledManifests)"> + $([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi')))) + + $(IntermediateOutputPath)WorkloadManifests.wxs @@ -287,7 +292,7 @@ - @(BundledManifests->' + @(_Manifests->' ', ' ')