diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f5750a19..d0c4385d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 https://github.com/dotnet/test-templates @@ -102,58 +102,58 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/winforms - c90f5134458cfdfd67cdae0a3fcaf1a3b7f14cf0 + 46195b1c4ad995a32046cbeeeb8d650550685c28 - + https://github.com/dotnet/wpf - b148c5c887e11f5bc1e40c01fa319ab24852e4b1 + c37ab558d3aebf3bfe0038c86e8a4be78d09e03c - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/microsoft/vstest - 9da4e7f7505af42b34e1a2d7ba6857f98782025f + 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/roslyn - 73338d92270b9f26982eca2e8872037a0214b912 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/msbuild - dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 diff --git a/eng/Versions.props b/eng/Versions.props index 0044c3713..b8ba016f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23115.5 + 8.0.0-preview.2.23121.7 - 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23121.2 @@ -58,46 +58,46 @@ - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 0.2.0 - 8.0.100-preview.2.23117.3 - 8.0.100-preview.2.23117.3 - 8.0.100-preview.2.23117.3 + 8.0.100-preview.2.23123.8 + 8.0.100-preview.2.23123.8 + 8.0.100-preview.2.23123.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 2.1.0 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230215-02 + 17.6.0-preview-20230221-02 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch b/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch deleted file mode 100644 index edebfd184..000000000 --- a/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: davidwengier -Date: Mon, 30 Jan 2023 15:40:22 +0000 -Subject: [PATCH] Add some projects to Razor.Slim.slnf - -Backport: https://github.com/dotnet/razor/pull/8188 ---- - Razor.Slim.slnf | 3 +++ - .../Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/Razor.Slim.slnf b/Razor.Slim.slnf -index 6e76d40f1..8328075c4 100644 ---- a/Razor.Slim.slnf -+++ b/Razor.Slim.slnf -@@ -6,6 +6,9 @@ - "src\\Compiler\\Microsoft.AspNetCore.Mvc.Razor.Extensions\\src\\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj", - "src\\Compiler\\Microsoft.AspNetCore.Razor.Language\\src\\Microsoft.AspNetCore.Razor.Language.csproj", - "src\\Compiler\\Microsoft.CodeAnalysis.Razor\\src\\Microsoft.CodeAnalysis.Razor.csproj", -+ "src\\Compiler\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj", -+ "src\\Compiler\\tools\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj", -+ "src\\Compiler\\tools\\Microsoft.CodeAnalysis.Razor.Tooling.Internal\\Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj", - "src\\Shared\\Microsoft.AspNetCore.Razor.LanguageSupport\\Microsoft.AspNetCore.Razor.LanguageSupport.csproj", - "src\\Razor\\src\\Microsoft.AspNetCore.Razor.Common\\Microsoft.AspNetCore.Razor.Common.csproj", - "src\\Razor\\src\\Microsoft.CodeAnalysis.Razor.Workspaces\\Microsoft.CodeAnalysis.Razor.Workspaces.csproj", -diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -index 278e35a42..745645fc9 100644 ---- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -+++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -@@ -8,6 +8,8 @@ - true - false - true -+ -+ false - - -