From e9585afd6dea905daffd186053fa34087ee197ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 18:26:43 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/sdk build 20230421.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23221.4 -> To Version 8.0.100-preview.4.23221.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 8.0.0-preview.4.23220.2 -> To Version 8.0.0-preview.4.23221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beefea4a7..f188467ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 59f01e3fae577b50c42408acad34d6ba90a6a7d0 + 02073ff819873094de30fa29ed08c520f5a2b9f7 - + https://github.com/dotnet/windowsdesktop - 59f01e3fae577b50c42408acad34d6ba90a6a7d0 + 02073ff819873094de30fa29ed08c520f5a2b9f7 - + https://github.com/dotnet/windowsdesktop - 59f01e3fae577b50c42408acad34d6ba90a6a7d0 + 02073ff819873094de30fa29ed08c520f5a2b9f7 - + https://github.com/dotnet/windowsdesktop - 59f01e3fae577b50c42408acad34d6ba90a6a7d0 + 02073ff819873094de30fa29ed08c520f5a2b9f7 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 33a9f70fb3afbf9d471834323f2ee056ae913eeb + 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 - + https://github.com/dotnet/sdk - 33a9f70fb3afbf9d471834323f2ee056ae913eeb + 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 - + https://github.com/dotnet/sdk - 33a9f70fb3afbf9d471834323f2ee056ae913eeb + 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 - + https://github.com/dotnet/sdk - 33a9f70fb3afbf9d471834323f2ee056ae913eeb + 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 - + https://github.com/dotnet/winforms - b3a0efc78e82ab0deba0d25d6f196f996e13bab5 + 924b8336f7a6e513c756f3c7f727b7f5ba8a5a06 - + https://github.com/dotnet/wpf - 50891a60626b6d14054cc746e0e5f592a896b59f + f05013b82d24df1e34721a31bebc3bb8f4da24a5 https://github.com/dotnet/fsharp @@ -137,9 +137,9 @@ b9c0f04d0ec3ec292bde52acccbc41c208931f07 - + https://github.com/microsoft/vstest - 1541fc31ead99a358c649e7e9fa203e0dd4d20a5 + 10eebba738292e0154358aeb5cc7e108dbe2067f diff --git a/eng/Versions.props b/eng/Versions.props index 43663a012..d30a302c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.4.23218.5 + 8.0.0-preview.4.23220.4 - 8.0.0-preview.5.23220.1 + 8.0.0-preview.5.23220.2 @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23221.4 - 8.0.100-preview.4.23221.4 - 8.0.100-preview.4.23221.4 + 8.0.100-preview.4.23221.6 + 8.0.100-preview.4.23221.6 + 8.0.100-preview.4.23221.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 + 8.0.0-preview.4.23221.2 + 8.0.0-preview.4.23221.2 + 8.0.0-preview.4.23221.2 + 8.0.0-preview.4.23221.2 @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23214.2 + 17.7.0-preview.23219.2 8.0.0-alpha.1.22557.12 From 126a7bf89d78db6e9571b1135f84c5110bd8770a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 18:54:16 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/sdk build 20230421.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23221.4 -> To Version 8.0.100-preview.4.23221.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 8.0.0-preview.4.23220.2 -> To Version 8.0.0-preview.4.23221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f188467ed..ee56d594c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 + 98f94547aebf39154eba5b7c87e692044d3b9355 - + https://github.com/dotnet/sdk - 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 + 98f94547aebf39154eba5b7c87e692044d3b9355 - + https://github.com/dotnet/sdk - 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 + 98f94547aebf39154eba5b7c87e692044d3b9355 - + https://github.com/dotnet/sdk - 67cc58c2f7dec4afa94f2a32669ec4e44b89d5f2 + 98f94547aebf39154eba5b7c87e692044d3b9355 diff --git a/eng/Versions.props b/eng/Versions.props index d30a302c3..700ed2734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23221.6 - 8.0.100-preview.4.23221.6 - 8.0.100-preview.4.23221.6 + 8.0.100-preview.4.23221.7 + 8.0.100-preview.4.23221.7 + 8.0.100-preview.4.23221.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eda5402b44a8adb841b86fa05156c8f8fb04da94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 19:37:46 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/sdk build 20230421.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23221.4 -> To Version 8.0.100-preview.4.23221.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 8.0.0-preview.4.23220.2 -> To Version 8.0.0-preview.4.23221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee56d594c..0d6996eba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 98f94547aebf39154eba5b7c87e692044d3b9355 + aac09aca77af03756ad35643315aba3c7cc995b1 - + https://github.com/dotnet/sdk - 98f94547aebf39154eba5b7c87e692044d3b9355 + aac09aca77af03756ad35643315aba3c7cc995b1 - + https://github.com/dotnet/sdk - 98f94547aebf39154eba5b7c87e692044d3b9355 + aac09aca77af03756ad35643315aba3c7cc995b1 - + https://github.com/dotnet/sdk - 98f94547aebf39154eba5b7c87e692044d3b9355 + aac09aca77af03756ad35643315aba3c7cc995b1 diff --git a/eng/Versions.props b/eng/Versions.props index 700ed2734..338365e24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23221.7 - 8.0.100-preview.4.23221.7 - 8.0.100-preview.4.23221.7 + 8.0.100-preview.4.23221.8 + 8.0.100-preview.4.23221.8 + 8.0.100-preview.4.23221.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fdf58a4e6324de56fe800e4583d835ca29ee6df Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 21 Apr 2023 15:17:45 -0500 Subject: [PATCH 4/8] remove format patch --- ...etCompilersToolsetVersion-instead-of.patch | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch deleted file mode 100644 index 4b35b4adc..000000000 --- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 21 Apr 2023 03:07:28 +0000 -Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of - MicrosoftNetCompilersToolsetPackageVersion - -Temporary fix for https://github.com/dotnet/source-build/issues/3392 ---- - Directory.Packages.props | 16 ++++++++-------- - eng/Versions.props | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c9041493..83f3d877 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -13,14 +13,14 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2d325ec6..e1bc7022 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -21,7 +21,7 @@ - 3.3.4 - 7.0.0-rc.1.22426.10 - -- 4.5.0-3.22602.7 -+ 4.5.0-3.22602.7 - - 2.0.0-beta4.22564.1 - 0.4.0-alpha.22564.1 -@@ -35,7 +35,7 @@ - - 6.6.0-preview.3.61 - -- 4.5.0-3.22602.7 -+ 4.5.0-3.22602.7 - - 1.1.2-beta1.22216.1 - From ac0ccb6148cfa59de102168f56f759fde7138b55 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 Apr 2023 20:24:07 +0000 Subject: [PATCH 5/8] Revert "remove format patch" This reverts commit 9fdf58a4e6324de56fe800e4583d835ca29ee6df. --- ...etCompilersToolsetVersion-instead-of.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch new file mode 100644 index 000000000..4b35b4adc --- /dev/null +++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch @@ -0,0 +1,61 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 21 Apr 2023 03:07:28 +0000 +Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of + MicrosoftNetCompilersToolsetPackageVersion + +Temporary fix for https://github.com/dotnet/source-build/issues/3392 +--- + Directory.Packages.props | 16 ++++++++-------- + eng/Versions.props | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index c9041493..83f3d877 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -13,14 +13,14 @@ + + + +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2d325ec6..e1bc7022 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -21,7 +21,7 @@ + 3.3.4 + 7.0.0-rc.1.22426.10 + +- 4.5.0-3.22602.7 ++ 4.5.0-3.22602.7 + + 2.0.0-beta4.22564.1 + 0.4.0-alpha.22564.1 +@@ -35,7 +35,7 @@ + + 6.6.0-preview.3.61 + +- 4.5.0-3.22602.7 ++ 4.5.0-3.22602.7 + + 1.1.2-beta1.22216.1 + From 4fb7b6eb328ec2b5277e5498c2db9e0283489d25 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 Apr 2023 20:24:54 +0000 Subject: [PATCH 6/8] Resolve format patch conflict --- ...-MicrosoftNetCompilersToolsetVersion-instead-of.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch index 4b35b4adc..acbd6003d 100644 --- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch +++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch @@ -41,15 +41,6 @@ diff --git a/eng/Versions.props b/eng/Versions.props index 2d325ec6..e1bc7022 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -21,7 +21,7 @@ - 3.3.4 - 7.0.0-rc.1.22426.10 - -- 4.5.0-3.22602.7 -+ 4.5.0-3.22602.7 - - 2.0.0-beta4.22564.1 - 0.4.0-alpha.22564.1 @@ -35,7 +35,7 @@ 6.6.0-preview.3.61 From 18095dc619aa7e07219fe09a57988d9e2dae06c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 21:25:26 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/sdk build 20230421.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23221.4 -> To Version 8.0.100-preview.4.23221.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 8.0.0-preview.4.23220.2 -> To Version 8.0.0-preview.4.23221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d6996eba..dec8c53ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb - + https://github.com/dotnet/aspnetcore - fca80883d95102eeb96e6fe9a68b170d54a4614c + e795ec77ab3737b54c8ab3e92f87a02d29eaeabb https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - aac09aca77af03756ad35643315aba3c7cc995b1 + 4ae139cdc1269a16e7b090550d9ff9bf20212560 - + https://github.com/dotnet/sdk - aac09aca77af03756ad35643315aba3c7cc995b1 + 4ae139cdc1269a16e7b090550d9ff9bf20212560 - + https://github.com/dotnet/sdk - aac09aca77af03756ad35643315aba3c7cc995b1 + 4ae139cdc1269a16e7b090550d9ff9bf20212560 - + https://github.com/dotnet/sdk - aac09aca77af03756ad35643315aba3c7cc995b1 + 4ae139cdc1269a16e7b090550d9ff9bf20212560 diff --git a/eng/Versions.props b/eng/Versions.props index 338365e24..128240c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 - 8.0.0-preview.4.23220.8 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 + 8.0.0-preview.4.23221.3 0.2.0 - 8.0.100-preview.4.23221.8 - 8.0.100-preview.4.23221.8 - 8.0.100-preview.4.23221.8 + 8.0.100-preview.4.23221.9 + 8.0.100-preview.4.23221.9 + 8.0.100-preview.4.23221.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5515a3632977180debacd0b1518657686d131400 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 22:23:25 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/sdk build 20230421.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23221.4 -> To Version 8.0.100-preview.4.23221.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 8.0.0-preview.4.23220.2 -> To Version 8.0.0-preview.4.23221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dec8c53ab..ce48f71d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 4ae139cdc1269a16e7b090550d9ff9bf20212560 + a18a63d84c5f04f207a431df2a917593d7ec1451 - + https://github.com/dotnet/sdk - 4ae139cdc1269a16e7b090550d9ff9bf20212560 + a18a63d84c5f04f207a431df2a917593d7ec1451 - + https://github.com/dotnet/sdk - 4ae139cdc1269a16e7b090550d9ff9bf20212560 + a18a63d84c5f04f207a431df2a917593d7ec1451 - + https://github.com/dotnet/sdk - 4ae139cdc1269a16e7b090550d9ff9bf20212560 + a18a63d84c5f04f207a431df2a917593d7ec1451 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf f05013b82d24df1e34721a31bebc3bb8f4da24a5 - + https://github.com/dotnet/fsharp - b9c0f04d0ec3ec292bde52acccbc41c208931f07 + 858e2df9631a385cbddef62eeb424f9b3071b031 - + https://github.com/dotnet/fsharp - b9c0f04d0ec3ec292bde52acccbc41c208931f07 + 858e2df9631a385cbddef62eeb424f9b3071b031 diff --git a/eng/Versions.props b/eng/Versions.props index 128240c7e..22f0eae6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23221.9 - 8.0.100-preview.4.23221.9 - 8.0.100-preview.4.23221.9 + 8.0.100-preview.4.23221.11 + 8.0.100-preview.4.23221.11 + 8.0.100-preview.4.23221.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)