From 26501197562333dacac457c8ae6d3ae430888cb0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 10 Oct 2022 22:57:01 -0700 Subject: [PATCH] Revert changes to eng/folder from branch merge --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++-------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db22b2f35..6bfdd18a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + 993983be2ce14ca67f7ff09b8b04e9b8391b3339 - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 @@ -149,14 +149,14 @@ linker - + https://github.com/dotnet/roslyn - 7971633700e06fdd0a46dbae78908582ee533c2a + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 + 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 50bf2ac7b..3fcf24983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22476.8 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22476.6 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 2.1.0 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)