diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581844303..9d09af6ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - d203ca39a4064de70d17bc60e3cf8e2b497c7cdc + 9604194ccf0a3d7cab50dbf0f4aee7ff4f32f1a0 - + https://github.com/dotnet/windowsdesktop - d203ca39a4064de70d17bc60e3cf8e2b497c7cdc + 9604194ccf0a3d7cab50dbf0f4aee7ff4f32f1a0 - + https://github.com/dotnet/windowsdesktop - d203ca39a4064de70d17bc60e3cf8e2b497c7cdc + 9604194ccf0a3d7cab50dbf0f4aee7ff4f32f1a0 - + https://github.com/dotnet/windowsdesktop - d203ca39a4064de70d17bc60e3cf8e2b497c7cdc + 9604194ccf0a3d7cab50dbf0f4aee7ff4f32f1a0 - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/aspnetcore - 4deb60bb65b090c50a0595452266ad73d4dcc68b + 58aff923593ed5c8e43993e21c6be482ebf8758d - + https://github.com/dotnet/sdk - b32df9afff77e8f1afbd417e7c70841867cb6cdc + d67400bb562e3b251503942e73e34a2cdede52fa - + https://github.com/dotnet/sdk - b32df9afff77e8f1afbd417e7c70841867cb6cdc + d67400bb562e3b251503942e73e34a2cdede52fa - + https://github.com/dotnet/sdk - b32df9afff77e8f1afbd417e7c70841867cb6cdc + d67400bb562e3b251503942e73e34a2cdede52fa - + https://github.com/dotnet/sdk - b32df9afff77e8f1afbd417e7c70841867cb6cdc + d67400bb562e3b251503942e73e34a2cdede52fa - + https://github.com/dotnet/sdk - b32df9afff77e8f1afbd417e7c70841867cb6cdc + d67400bb562e3b251503942e73e34a2cdede52fa @@ -144,22 +144,22 @@ - + https://github.com/dotnet/winforms - 226a5b5d3782f40d8c84cdacfa3c49b3f7cc042e + dd56dedb821c890390992c40ad50bcde35a6dd0f - + https://github.com/dotnet/wpf - 0b4cb73076396274466fc34146f0c3a03503a69e + db12339ccd43037d5e1229fb5c84b87f13c86de4 - + https://github.com/dotnet/fsharp - 099e0ae7d788bb0f53f14b5c349012c33bff3372 + 9de468a9bcd1dd5f3791639e0be2227aee0696a7 - + https://github.com/dotnet/fsharp - 099e0ae7d788bb0f53f14b5c349012c33bff3372 + 9de468a9bcd1dd5f3791639e0be2227aee0696a7 @@ -172,57 +172,57 @@ f21d0dae0b91fe59e4afa92166bd721ddd2f0036 - + https://github.com/dotnet/runtime - a79c62ddc8089cf2879ed36eac9aa333b32bde5f + 4f099091aa1dbcc3db0043241f3a4e81ef5abfdd - + https://github.com/dotnet/roslyn - 2fa19b085cdd5bd3c69c3d66dd53aa3b65c843c8 + 76ca39e7b05779d9616fdc5ef07bacfdb57a4877 - + https://github.com/dotnet/roslyn - 2fa19b085cdd5bd3c69c3d66dd53aa3b65c843c8 + 76ca39e7b05779d9616fdc5ef07bacfdb57a4877 - + https://github.com/dotnet/msbuild - e71eb7a1fc535b438007286c840d7cecc139d13b + 15f7ddcaafa6622447fa69c1785ab7b3d1183719 - + https://github.com/dotnet/msbuild - e71eb7a1fc535b438007286c840d7cecc139d13b + 15f7ddcaafa6622447fa69c1785ab7b3d1183719 - + https://github.com/nuget/nuget.client - 280d053fecd4517ade3bd89e543f5c8df18a1063 + 8b658e2eee6391936887b9fd1b39f7918d16a9cb https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 329f74da67c0620b98574dfa6e46e03a03f21955 + 3ab438b1e45a1cde263a48a522d7082db14106c8 - + https://github.com/dotnet/emsdk - 329f74da67c0620b98574dfa6e46e03a03f21955 + 3ab438b1e45a1cde263a48a522d7082db14106c8 - + https://github.com/dotnet/deployment-tools - 9abdab1d923b427c26685d793e9ddc8344f3da5c + 58b859ff2939ebee0c4e81fb30e8c69099e195c6 - + https://github.com/dotnet/deployment-tools - 9abdab1d923b427c26685d793e9ddc8344f3da5c + 58b859ff2939ebee0c4e81fb30e8c69099e195c6 @@ -231,14 +231,14 @@ f1ef074dfcf79d2f2da6e6ff9df8696a32aa063c - + https://github.com/dotnet/command-line-api - 46fea71e3d98dad0d676950522004b7f295dd372 + e9ac4ff4293cf853f3d07eb9e747aef27f5be965 - + https://github.com/dotnet/command-line-api - 46fea71e3d98dad0d676950522004b7f295dd372 + e9ac4ff4293cf853f3d07eb9e747aef27f5be965 diff --git a/eng/Versions.props b/eng/Versions.props index 95629c302..93f5a1962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-preview.2.24108.1 + 9.0.0-preview.2.24112.2 - 9.0.0-preview.2.24108.3 + 9.0.0-preview.2.24112.2 @@ -73,49 +73,49 @@ - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 - 9.0.0-preview.2.24109.2 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24112.5 0.2.0 - 9.0.100-preview.2.24110.2 - 9.0.100-preview.2.24110.2 - 9.0.100-preview.2.24110.2 + 9.0.100-preview.2.24112.30 + 9.0.100-preview.2.24112.30 + 9.0.100-preview.2.24112.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24109.15 + 4.10.0-2.24112.4 - 9.0.0-preview.2.24109.4 + 9.0.0-preview.2.24112.16 - 9.0.0-preview.2.24109.4 - 9.0.0-preview.2.24109.4 - 9.0.0-preview.2.24109.4 - 9.0.0-preview.2.24109.4 - 9.0.0-preview.2.24109.4 + 9.0.0-preview.2.24112.16 + 9.0.0-preview.2.24112.16 + 9.0.0-preview.2.24112.16 + 9.0.0-preview.2.24112.16 + 9.0.0-preview.2.24112.16 2.1.0 - 9.0.0-preview.2.24109.1 - 9.0.0-preview.2.24109.1 - 9.0.0-preview.2.24109.1 - 9.0.0-preview.2.24109.1 + 9.0.0-preview.2.24112.2 + 9.0.0-preview.2.24112.2 + 9.0.0-preview.2.24112.2 + 9.0.0-preview.2.24112.2 @@ -127,11 +127,11 @@ - 6.10.0-preview.2.29 + 6.10.0-preview.2.32 - 2.0.0-preview.1.24101.1 + 2.0.0-preview.1.24105.2 @@ -261,7 +261,7 @@ 14.0.9712-net9-p1 17.0.9712-net9-p1 - 9.0.0-preview.2.24105.1 + 9.0.0-preview.2.24109.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/winforms/0001-Don-t-error-when-file-copy-fails-due-to-locking-unti.patch b/src/SourceBuild/patches/winforms/0001-Don-t-error-when-file-copy-fails-due-to-locking-unti.patch deleted file mode 100644 index 6763d4e9a..000000000 --- a/src/SourceBuild/patches/winforms/0001-Don-t-error-when-file-copy-fails-due-to-locking-unti.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a91eef2a8e4c53f4674b24ff162622f3c80c054d Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Fri, 9 Feb 2024 10:59:55 -0800 -Subject: [PATCH] Don't error when file copy fails due to locking until all the - backoffs have failed - -Backport: https://github.com/dotnet/winforms/pull/10858 ---- - eng/SourceBuild.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 0d0194fb6..e951a31a0 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -4,5 +4,6 @@ - - winforms - true -+ $(InnerBuildArgs) -warnNotAsError:MSB3026 - - -\ No newline at end of file --- -2.43.0.windows.1 -